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

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

This commit is contained in:
Simon Giraudot 2017-07-07 14:36:45 +02:00
parent 09c11ca84a
commit 6bc9fb5852
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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