--- modules/features2d/src/keypoint.cpp.orig	Tue Feb  7 20:54:59 2012
+++ modules/features2d/src/keypoint.cpp	Tue Feb  7 20:55:22 2012
@@ -183,7 +183,7 @@
 {
     if( borderSize > 0)
     {
-        keypoints.erase( remove_if(keypoints.begin(), keypoints.end(),
+        keypoints.erase( std::remove_if(keypoints.begin(), keypoints.end(),
                                    RoiPredicate(Rect(Point(borderSize, borderSize),
                                                      Point(imageSize.width - borderSize, imageSize.height - borderSize)))),
                          keypoints.end() );
@@ -210,7 +210,7 @@
     CV_Assert( maxSize >= 0);
     CV_Assert( minSize <= maxSize );
 
-    keypoints.erase( remove_if(keypoints.begin(), keypoints.end(), SizePredicate(minSize, maxSize)),
+    keypoints.erase( std::remove_if(keypoints.begin(), keypoints.end(), SizePredicate(minSize, maxSize)),
                      keypoints.end() );
 }
 
@@ -232,7 +232,7 @@
     if( mask.empty() )
         return;
 
-    keypoints.erase(remove_if(keypoints.begin(), keypoints.end(), MaskPredicate(mask)), keypoints.end());
+    keypoints.erase(std::remove_if(keypoints.begin(), keypoints.end(), MaskPredicate(mask)), keypoints.end());
 }
 
 struct KeyPoint_LessThan
--- modules/features2d/src/matchers.cpp.orig	Tue Feb  7 21:00:25 2012
+++ modules/features2d/src/matchers.cpp	Tue Feb  7 21:01:30 2012
@@ -76,7 +76,7 @@
 DescriptorMatcher::DescriptorCollection::DescriptorCollection( const DescriptorCollection& collection )
 {
     mergedDescriptors = collection.mergedDescriptors.clone();
-    copy( collection.startIdxs.begin(), collection.startIdxs.begin(), startIdxs.begin() );
+    std::copy( collection.startIdxs.begin(), collection.startIdxs.begin(), startIdxs.begin() );
 }
 
 DescriptorMatcher::DescriptorCollection::~DescriptorCollection()
@@ -853,9 +853,9 @@
 
     keypoints.resize( collection.keypoints.size() );
     for( size_t i = 0; i < keypoints.size(); i++ )
-        copy( collection.keypoints[i].begin(), collection.keypoints[i].end(), keypoints[i].begin() );
+        std::copy( collection.keypoints[i].begin(), collection.keypoints[i].end(), keypoints[i].begin() );
 
-    copy( collection.startIndices.begin(), collection.startIndices.end(), startIndices.begin() );
+    std::copy( collection.startIndices.begin(), collection.startIndices.end(), startIndices.begin() );
 }
 
 void GenericDescriptorMatcher::KeyPointCollection::add( const vector<Mat>& _images,