From: bangerth Date: Tue, 28 Oct 2008 23:24:24 +0000 (+0000) Subject: IBM's xlC is unhappy if we do -DBOOST_NO_SLIST on the command line and later do ... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24c47c654ddb8e67e3d926c0905142f3dae19e13;p=dealii-svn.git IBM's xlC is unhappy if we do -DBOOST_NO_SLIST on the command line and later do #define BOOST_NO_SLIST, claiming that the two have differing definitions. I assume that means that the former is equivalent to -DBOOST_NO_SLIST=1 whereas the latter sets it to ''. I'm relatively unsure about this, however. That said, the problem is easily solved by simply not redefining the symbol if it is already defined. git-svn-id: https://svn.dealii.org/trunk@17383 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/boost/include/boost/config/suffix.hpp b/deal.II/contrib/boost/include/boost/config/suffix.hpp index 2e72b3f5df..681bae52e8 100644 --- a/deal.II/contrib/boost/include/boost/config/suffix.hpp +++ b/deal.II/contrib/boost/include/boost/config/suffix.hpp @@ -267,11 +267,15 @@ // Note that this is for backwards compatibility only. // # ifndef BOOST_HAS_SLIST +# ifndef BOOST_NO_SLIST # define BOOST_NO_SLIST +# endif # endif # ifndef BOOST_HAS_HASH +# ifndef BOOST_NO_HASH # define BOOST_NO_HASH +# endif # endif //