songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: "Add hack in config.h for boost detection of CXX11 features with ICC" 

We have to check `__GXX_EXPERIMENTAL_CXX0X__`.

The issue in Boost-1.53 is that the other macro
`__GXX_EXPERIMENTAL_CPP0X__` is checked instead.
This commit is contained in:
Laurent Rineau 2017-07-07 15:49:09 +02:00 committed by Simon Giraudot
parent 6bc9fb5852
commit 33871eac4b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Installation/include/CGAL/config.h
View File

@ -117,16 +117,16 @@
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES # define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif #endif
// workaround for the bug https://svn.boost.org/trac10/ticket/12534 // workaround for the bug https://svn.boost.org/trac10/ticket/12534
// That bug was introduced in Boost 1.62 and fixed in 1.63. // That bug was introduced in Boost 1.62 and fixed in 1.63.
#if BOOST_VERSION >= 106200 && BOOSTS_VERSION < 106300 #if BOOST_VERSION >= 106200 && BOOSTS_VERSION < 106300
# include <boost/container/flat_map.hpp> # include <boost/container/flat_map.hpp>
#endif======= #endif
// Hack: boost does not detect correctly the cxx11 features of ICC // Hack: Boost<1.55 does not detect correctly the C++11 features of ICC.
// We declare by hand two features that we need (variadic templates and rvalue references) // We declare by hand two features that we need (variadic templates and
#ifdef __INTEL_COMPILER // rvalue references).
#if defined(_INTEL_COMPILER) && defined(__GXX_EXPERIMENTAL_CXX0X__)
# undef BOOST_NO_CXX11_VARIADIC_TEMPLATES # undef BOOST_NO_CXX11_VARIADIC_TEMPLATES
# undef BOOST_NO_CXX11_RVALUE_REFERENCES # undef BOOST_NO_CXX11_RVALUE_REFERENCES
#endif #endif