From 9683645bab8b353bb9b43613cf99b3c68a73a537 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Sun, 2 Nov 2014 17:45:09 +0300
Subject: [PATCH] Remove old MSVC++ std::map and stdext::hash_map from map
 tests

---
 projects/Win/vc12/cds.sln                         |  4 ----
 .../map2/{std_hash_map_gcc.h => std_hash_map.h}   | 15 +++++++--------
 2 files changed, 7 insertions(+), 12 deletions(-)
 rename tests/unit/map2/{std_hash_map_gcc.h => std_hash_map.h} (90%)

diff --git a/projects/Win/vc12/cds.sln b/projects/Win/vc12/cds.sln
index aabc38a0..8789bdbb 100644
--- a/projects/Win/vc12/cds.sln
+++ b/projects/Win/vc12/cds.sln
@@ -71,11 +71,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "map", "map", "{6BB7A27F-FC5
 		..\..\..\tests\unit\map2\map_defs.h = ..\..\..\tests\unit\map2\map_defs.h
 		..\..\..\tests\unit\map2\map_types.h = ..\..\..\tests\unit\map2\map_types.h
 		..\..\..\tests\unit\map2\std_hash_map.h = ..\..\..\tests\unit\map2\std_hash_map.h
-		..\..\..\tests\unit\map2\std_hash_map_gcc.h = ..\..\..\tests\unit\map2\std_hash_map_gcc.h
-		..\..\..\tests\unit\map2\std_hash_map_vc.h = ..\..\..\tests\unit\map2\std_hash_map_vc.h
 		..\..\..\tests\unit\map2\std_map.h = ..\..\..\tests\unit\map2\std_map.h
-		..\..\..\tests\unit\map2\std_map_gcc.h = ..\..\..\tests\unit\map2\std_map_gcc.h
-		..\..\..\tests\unit\map2\std_map_vc.h = ..\..\..\tests\unit\map2\std_map_vc.h
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "set", "set", "{A64449B7-90FB-4E2B-A686-9EFC0E298644}"
diff --git a/tests/unit/map2/std_hash_map_gcc.h b/tests/unit/map2/std_hash_map.h
similarity index 90%
rename from tests/unit/map2/std_hash_map_gcc.h
rename to tests/unit/map2/std_hash_map.h
index e3984b74..0c808963 100644
--- a/tests/unit/map2/std_hash_map_gcc.h
+++ b/tests/unit/map2/std_hash_map.h
@@ -5,7 +5,6 @@
 
 #include <mutex>    //unique_lock
 #include <unordered_map>
-//#include <functional>   // ref
 
 namespace map2 {
 
@@ -22,7 +21,7 @@ namespace map2 {
     {
     public:
         Lock m_lock;
-        typedef std::unique_lock<Lock> AutoLock;
+        typedef std::unique_lock<Lock> scoped_lock;
         typedef std::unordered_map<
             Key, Value
             , std::hash<Key>
@@ -38,20 +37,20 @@ namespace map2 {
 
         bool find( const Key& key )
         {
-            AutoLock al( m_lock );
+            scoped_lock al( m_lock );
             return base_class::find( key ) != base_class::end();
         }
 
         bool insert( const Key& key, const Value& val )
         {
-            AutoLock al( m_lock );
+            scoped_lock al( m_lock );
             return base_class::insert( typename base_class::value_type(key, val)).second;
         }
 
         template <typename T, typename Func>
         bool insert( const Key& key, const T& val, Func func )
         {
-            AutoLock al( m_lock );
+            scoped_lock al( m_lock );
             std::pair<typename base_class::iterator, bool> pRet = base_class::insert( typename base_class::value_type(key, Value() ));
             if ( pRet.second ) {
                 func( pRet.first->second, val );
@@ -63,7 +62,7 @@ namespace map2 {
         template <typename T, typename Func>
         std::pair<bool, bool> ensure( const T& key, Func func )
         {
-            AutoLock al( m_lock );
+            scoped_lock al( m_lock );
             std::pair<typename base_class::iterator, bool> pRet = base_class::insert( typename base_class::value_type( key, Value() ));
             if ( pRet.second ) {
                 func( true, *pRet.first );
@@ -77,14 +76,14 @@ namespace map2 {
 
         bool erase( const Key& key )
         {
-            AutoLock al( m_lock );
+            scoped_lock al( m_lock );
             return base_class::erase( key ) != 0;
         }
 
         template <typename T, typename Func>
         bool erase( const T& key, Func func )
         {
-            AutoLock al( m_lock );
+            scoped_lock al( m_lock );
             typename base_class::iterator it = base_class::find( key );
             if ( it != base_class::end() ) {
                 func( *it );
-- 
2.34.1