]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Avoid using 'define' inside a macro. 3924/head
authorDavid Wells <wellsd2@rpi.edu>
Sat, 4 Feb 2017 02:17:49 +0000 (21:17 -0500)
committerDavid Wells <wellsd2@rpi.edu>
Sat, 4 Feb 2017 02:17:49 +0000 (21:17 -0500)
This is technically illegal and clang rightfully complains.

Patch from https://github.com/boostorg/serialization/pull/49

bundled/boost-1.62.0/include/boost/archive/detail/iserializer.hpp

index 6bec499bd254e2af174964a65e0f032d3166b9a7..2caaefc253c6d49cf3c9f8bd23e237ce4040f0cb 100644 (file)
@@ -57,11 +57,8 @@ namespace std{
 
 #include <boost/serialization/assume_abstract.hpp>
 
-#ifndef BOOST_MSVC
-    #define DONT_USE_HAS_NEW_OPERATOR (                    \
-           BOOST_WORKAROUND(__IBMCPP__, < 1210)            \
-        || defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x590)   \
-    )
+#if BOOST_WORKAROUND(__IBMCPP__, < 1210) || (defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x590))
+    #define DONT_USE_HAS_NEW_OPERATOR 1
 #else
     #define DONT_USE_HAS_NEW_OPERATOR 0
 #endif

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.