From: David Wells <wellsd2@rpi.edu>
Date: Sat, 4 Feb 2017 02:17:49 +0000 (-0500)
Subject: Avoid using 'define' inside a macro.
X-Git-Tag: v8.5.0-rc1~150^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10443935f60a0c8f4add002ace6f46d557088443;p=dealii.git

Avoid using 'define' inside a macro.

This is technically illegal and clang rightfully complains.

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

diff --git a/bundled/boost-1.62.0/include/boost/archive/detail/iserializer.hpp b/bundled/boost-1.62.0/include/boost/archive/detail/iserializer.hpp
index 6bec499bd2..2caaefc253 100644
--- a/bundled/boost-1.62.0/include/boost/archive/detail/iserializer.hpp
+++ b/bundled/boost-1.62.0/include/boost/archive/detail/iserializer.hpp
@@ -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