renamed cv::flann to cv::cvflann to avoid name conflicts

2010-05-21 20:37:05 +00:00
parent 60019422e8
commit b94e09bfeb
39 changed files with 155 additions and 144 deletions
--- a/3rdparty/include/flann/flann.hpp
+++ b/3rdparty/include/flann/flann.hpp
@@ -40,7 +40,7 @@

 #include "flann.h"

-namespace flann
+namespace cvflann
 {

 class NNIndex;