Better C++11 detection for visual studio

websocketpp/common/functional.hpp

@@ -30,12 +30,25 @@
 
 #include <websocketpp/common/cpp11.hpp>
 
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 functional header, then prefer it to 
+// boost.
 #if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_FUNCTIONAL_
     #ifndef _WEBSOCKETPP_CPP11_FUNCTIONAL_
         #define _WEBSOCKETPP_CPP11_FUNCTIONAL_
     #endif
 #endif
 
+// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
+// the use of C++11 functional header then prefer it to boost.
+#if _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_FUNCTIONAL_
+    #ifndef _WEBSOCKETPP_CPP11_FUNCTIONAL_
+        #define _WEBSOCKETPP_CPP11_FUNCTIONAL_
+    #endif
+#endif
+
+
+
 #ifdef _WEBSOCKETPP_CPP11_FUNCTIONAL_
     #include <functional>
 #else

websocketpp/common/memory.hpp

@@ -30,12 +30,25 @@
 
 #include <websocketpp/common/cpp11.hpp>
 
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 memory header, then prefer it to 
+// boost.
 #if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_
     #ifndef _WEBSOCKETPP_CPP11_MEMORY_
         #define _WEBSOCKETPP_CPP11_MEMORY_
     #endif
 #endif
 
+// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
+// the use of C++11 functional header then prefer it to boost.
+#if _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_
+    #ifndef _WEBSOCKETPP_CPP11_MEMORY_
+        #define _WEBSOCKETPP_CPP11_MEMORY_
+    #endif
+#endif
+
+
+
 #ifdef _WEBSOCKETPP_CPP11_MEMORY_
     #include <memory>
 #else

websocketpp/common/platforms.hpp

@@ -38,4 +38,9 @@
     #define NOMINMAX
 #endif
 
+// Bump up the variadic parameter max for Visual Studio 2012
+#if _MSC_VER == 1700
+    #define _VARIADIC_MAX 8
+#endif
+
 #endif // WEBSOCKETPP_COMMON_PLATFORMS_HPP

websocketpp/common/random.hpp

@@ -30,12 +30,26 @@
 
 #include <websocketpp/common/cpp11.hpp>
 
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 random header, then prefer it to 
+// boost.
 #if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_RANDOM_DEVICE_
     #ifndef _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
         #define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
     #endif
 #endif
 
+
+// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
+// the use of C++11 random header then prefer it to boost.
+#if _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_
+    #ifndef _WEBSOCKETPP_CPP11_MEMORY_
+        #define _WEBSOCKETPP_CPP11_MEMORY_
+    #endif
+#endif
+
+
+
 #ifdef _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
     #include <random>
 #else

websocketpp/common/system_error.hpp

@@ -28,12 +28,28 @@
 #ifndef WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP
 #define WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP
 
-#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_SYSTEM_ERROR_
+
+#include <websocketpp/common/cpp11.hpp>
+
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 system_error header, then prefer it to 
+// boost.
+#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_SYSTEM_ERROR_
     #ifndef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
         #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
     #endif
 #endif
 
+// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
+// the use of C++11 system_error header then prefer it to boost.
+#if _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_SYSTEM_ERROR_
+    #ifndef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+        #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+    #endif
+#endif
+
+
+
 #ifdef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
     #include <system_error>
 #else