commit x64 compilation from lulu cause the other branch dont seems to compile properly at home

include/opencv2/flann/miniflann.hpp

@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef _OPENCV_MINIFLANN_HPP_
-#define _OPENCV_MINIFLANN_HPP_
+#ifndef OPENCV_MINIFLANN_HPP
+#define OPENCV_MINIFLANN_HPP
 
 #include "opencv2/core.hpp"
 #include "opencv2/flann/defines.h"
@@ -74,6 +74,10 @@ struct CV_EXPORTS IndexParams
                 std::vector<double>& numValues) const;
 
     void* params;
+
+private:
+    IndexParams(const IndexParams &); // copy disabled
+    IndexParams& operator=(const IndexParams &); // assign disabled
 };
 
 struct CV_EXPORTS KDTreeIndexParams : public IndexParams