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/flann/util/timer.h
+++ b/3rdparty/flann/util/timer.h
@@ -34,7 +34,7 @@
 #include <time.h>


-namespace flann
+namespace cvflann
 {

 /**