Merge branch 'develop' into feature/constexpr

2018-01-22 08:07:54 +02:00
parent a14074bafc 8cc57370ca
commit 9f5cbe223c
2 changed files with 12 additions and 8 deletions
@@ -12,13 +12,10 @@
 # define _CRT_SECURE_NO_WARNINGS

 #include <boost/config.hpp>
-#include <boost/config/pragma_message.hpp>
 #include <iostream>

 #if defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR)

-BOOST_PRAGMA_MESSAGE("Skipping test, BOOST_NO_CXX11_HDR_SYSTEM_ERROR is defined")
-
 int main()
 {
  std::cout
@@ -26,11 +23,6 @@ int main()
    " support header <system_error> so interoperation will not be tested.\n";
 }

-#elif defined(UBSAN)
-
-BOOST_PRAGMA_MESSAGE("Skipping test, UBSAN is defined")
-int main() {}
-
 #else

 #include <boost/system/error_code.hpp>