Ver Fonte

Compilation fix for VS 2017 (#355)

Related to: https://developercommunity.visualstudio.com/content/problem/69009/compilation-error-on-msvc2015-on-boostbase-from-me.html
Dydzio há 8 anos atrás
pai
commit
1c2f4bc8f6
1 ficheiros alterados com 2 adições e 2 exclusões
  1. 2 2
      Global.h

+ 2 - 2
Global.h

@@ -154,8 +154,8 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
 #define BOOST_THREAD_DONT_PROVIDE_THREAD_DESTRUCTOR_CALLS_TERMINATE_IF_JOINABLE 1
 #define BOOST_BIND_NO_PLACEHOLDERS
 
-#if defined(_MSC_VER) && (_MSC_VER == 1900)
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES //Variadic templates are buggy in VS2015, so turn this off to avoid compile errors
+#if defined(_MSC_VER) && (_MSC_VER == 1900 || _MSC_VER == 1910)
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES //Variadic templates are buggy in VS2015 and VS2017, so turn this off to avoid compile errors
 #endif
 
 #include <boost/algorithm/string.hpp>