Fixed friend class std::lock_guard for MSVS higher than 2015 (1900)

Author: AlexeyAB

CDS_test/safe_ptr.h

@@ -73,10 +73,10 @@ namespace sf {
             template<typename some_type> friend struct xlocked_safe_ptr;
             template<typename some_type> friend struct slocked_safe_ptr;
             template<typename, typename, size_t, size_t> friend class lock_timed_transaction;
-#if (_WIN32 && _MSC_VER < 1900)
-			template<class mutex_type> friend class std::lock_guard;  // MSVS2013 or Clang 4.0
+#if (_MSC_VER && _MSC_VER == 1900)
+            template<class... mutex_types> friend class std::lock_guard;  // MSVS2015
 #else
-			template<class... mutex_types> friend class std::lock_guard;  // C++17 or MSVS2015
+            template<class mutex_type> friend class std::lock_guard;  // other compilers
 #endif
 #ifdef SHARED_MTX    
             template<typename mutex_type> friend class std::shared_lock;  // C++14

Real_app_bench/safe_ptr.h

@@ -73,10 +73,10 @@ namespace sf {
             template<typename some_type> friend struct xlocked_safe_ptr;
             template<typename some_type> friend struct slocked_safe_ptr;
             template<typename, typename, size_t, size_t> friend class lock_timed_transaction;
-#if (_WIN32 && _MSC_VER < 1900)
-			template<class mutex_type> friend class std::lock_guard;  // MSVS2013 or Clang 4.0
+#if (_MSC_VER && _MSC_VER == 1900)
+            template<class... mutex_types> friend class std::lock_guard;  // MSVS2015
 #else
-			template<class... mutex_types> friend class std::lock_guard;  // C++17 or MSVS2015
+            template<class mutex_type> friend class std::lock_guard;  // other compilers
 #endif
 #ifdef SHARED_MTX    
             template<typename mutex_type> friend class std::shared_lock;  // C++14

any_object_threadsafe/safe_ptr.h

@@ -51,10 +51,10 @@ class safe_ptr {
     void unlock() { mtx_ptr->unlock(); }
     friend struct link_safe_ptrs;
     template<size_t, typename, size_t, size_t> friend class lock_timed_any;
-#if (_WIN32 && _MSC_VER < 1900)
-	template<class mutex_type> friend class std::lock_guard;  // MSVS2013 or Clang 4.0
+#if (_MSC_VER && _MSC_VER == 1900)
+    template<class... mutex_types> friend class std::lock_guard;  // MSVS2015
 #else
-	template<class... mutex_types> friend class std::lock_guard;  // C++17 or MSVS2015
+    template<class mutex_type> friend class std::lock_guard;  // other compilers
 #endif
 public:
     template<typename... Args>

bench_contfree/main.cpp

@@ -66,10 +66,10 @@ class safe_ptr {
     template<typename some_type> friend struct xlocked_safe_ptr;
     template<typename some_type> friend struct slocked_safe_ptr;
     template<typename, typename, size_t, size_t> friend class lock_timed_transaction;
-#if (_WIN32 && _MSC_VER < 1900)
-    template<class mutex_type> friend class std::lock_guard;  // MSVS2013 or Clang 4.0
+#if (_MSC_VER && _MSC_VER == 1900)
+    template<class... mutex_types> friend class std::lock_guard;  // MSVS2015
 #else
-    template<class... mutex_types> friend class std::lock_guard;  // C++17 or MSVS2015
+    template<class mutex_type> friend class std::lock_guard;  // other compilers
 #endif
 #ifdef SHARED_MTX    
     template<typename mutex_type> friend class std::shared_lock;  // C++14

benchmark/main.cpp

@@ -66,10 +66,10 @@ class safe_ptr {
     template<typename some_type> friend struct xlocked_safe_ptr;
     template<typename some_type> friend struct slocked_safe_ptr;
     template<typename, typename, size_t, size_t> friend class lock_timed_transaction;
-#if (_WIN32 && _MSC_VER < 1900)
-    template<class mutex_type> friend class std::lock_guard;  // MSVS2013 or Clang 4.0
+#if (_MSC_VER && _MSC_VER == 1900)
+    template<class... mutex_types> friend class std::lock_guard;  // MSVS2015
 #else
-    template<class... mutex_types> friend class std::lock_guard;  // C++17 or MSVS2015
+    template<class mutex_type> friend class std::lock_guard;  // other compilers
 #endif
 #ifdef SHARED_MTX    
     template<typename mutex_type> friend class std::shared_lock;  // C++14

safe_ptr.h

@@ -73,10 +73,10 @@ namespace sf {
             template<typename some_type> friend struct xlocked_safe_ptr;
             template<typename some_type> friend struct slocked_safe_ptr;
             template<typename, typename, size_t, size_t> friend class lock_timed_transaction;
-#if (_WIN32 && _MSC_VER < 1900 || __clang__)
-			template<class mutex_type> friend class std::lock_guard;  // MSVS2013 or Clang 4.0
+#if (_MSC_VER && _MSC_VER == 1900)
+            template<class... mutex_types> friend class std::lock_guard;  // MSVS2015
 #else
-			template<class... mutex_types> friend class std::lock_guard;  // C++17 or MSVS2015
+            template<class mutex_type> friend class std::lock_guard;  // other compilers
 #endif
 #ifdef SHARED_MTX    
             template<typename mutex_type> friend class std::shared_lock;  // C++14