Merge remote-tracking branch 'mariusmuja/master'

Author: mcleary

src/cpp/flann/algorithms/hierarchical_clustering_index.h

@@ -37,7 +37,10 @@
 #include <cassert>
 #include <limits>
 #include <cmath>
-#include <stdint.h>
+
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t) -1)
+#endif
 
 #include "flann/general.h"
 #include "flann/algorithms/nn_index.h"

src/cpp/flann/algorithms/lsh_index.h

@@ -69,9 +69,9 @@ struct LshIndexParams : public IndexParams
 };
 
 /**
- * Randomized kd-tree index
+ * Locality-sensitive hashing  index
  *
- * Contains the k-d trees and other information for indexing a set of points
+ * Contains the tables and other information for indexing a set of points
  * for nearest-neighbor matching.
  */
 template<typename Distance>