From 1cf96d36cd8740f5ca881066ca581632f068c0ce Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Tue, 10 Apr 2012 19:16:31 +0000
Subject: [PATCH] Corrected fix of flann deprecation warnings

---
 modules/flann/include/opencv2/flann/flann.hpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/flann/include/opencv2/flann/flann.hpp b/modules/flann/include/opencv2/flann/flann.hpp
index a01e1a84f..93dd89c67 100644
--- a/modules/flann/include/opencv2/flann/flann.hpp
+++ b/modules/flann/include/opencv2/flann/flann.hpp
@@ -225,7 +225,11 @@ int GenericIndex<Distance>::radiusSearch(const Mat& query, Mat& indices, Mat& di
  * @deprecated Use GenericIndex class instead
  */
 template <typename T>
-class Index_ {
+class
+#ifndef _MSC_VER
+ FLANN_DEPRECATED
+#endif
+ Index_ {
 public:
         typedef typename L2<T>::ElementType ElementType;
         typedef typename L2<T>::ResultType DistanceType;
@@ -277,8 +281,10 @@ private:
         ::cvflann::Index< L1<ElementType> >* nnIndex_L1;
 };
 
+#ifdef _MSC_VER
 template <typename T>
 class FLANN_DEPRECATED Index_;
+#endif
 
 template <typename T>
 Index_<T>::Index_(const Mat& dataset, const ::cvflann::IndexParams& params)