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

Update list of boost headers that break Qt4 moc.

This commit is contained in:
Marc Glisse 2016-09-30 11:12:19 +02:00
parent 8b95f0d8f6
commit 942f13c26b
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,8 +58,9 @@
// https://bugreports.qt-project.org/browse/QTBUG-22829 // https://bugreports.qt-project.org/browse/QTBUG-22829
#ifdef Q_MOC_RUN #ifdef Q_MOC_RUN
// When Qt moc runs on CGAL files, do not process // When Qt moc runs on CGAL files, do not process
// <boost/type_traits/has_operator.hpp> // <boost/type_traits/detail/has_binary_operator.hpp>
# define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED # define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
# define BOOST_TT_HAS_BIT_AND_HPP_INCLUDED
# define BOOST_TT_HAS_BIT_AND_ASSIGN_HPP_INCLUDED # define BOOST_TT_HAS_BIT_AND_ASSIGN_HPP_INCLUDED
# define BOOST_TT_HAS_BIT_OR_HPP_INCLUDED # define BOOST_TT_HAS_BIT_OR_HPP_INCLUDED
# define BOOST_TT_HAS_BIT_OR_ASSIGN_HPP_INCLUDED # define BOOST_TT_HAS_BIT_OR_ASSIGN_HPP_INCLUDED
@ -90,6 +91,18 @@
// do not include <boost/random.hpp> either // do not include <boost/random.hpp> either
// it includes <boost/type_traits/has_binary_operator.hpp> // it includes <boost/type_traits/has_binary_operator.hpp>
# define BOOST_RANDOM_HPP # define BOOST_RANDOM_HPP
// <boost/type_traits/detail/has_prefix_operator.hpp> fails as well
# define BOOST_TT_HAS_COMPLEMENT_HPP_INCLUDED
# define BOOST_TT_HAS_DEREFERENCE_HPP_INCLUDED
# define BOOST_TT_HAS_LOGICAL_NOT_HPP_INCLUDED
# define BOOST_TT_HAS_NEGATE_HPP_INCLUDED
# define BOOST_TT_HAS_PRE_DECREMENT_HPP_INCLUDED
# define BOOST_TT_HAS_PRE_INCREMENT_HPP_INCLUDED
# define BOOST_TT_HAS_UNARY_MINUS_HPP_INCLUDED
# define BOOST_TT_HAS_UNARY_PLUS_HPP_INCLUDED
// <boost/type_traits/detail/has_postfix_operator.hpp> fails as well
# define BOOST_TT_HAS_POST_DECREMENT_HPP_INCLUDED
# define BOOST_TT_HAS_POST_INCREMENT_HPP_INCLUDED
#endif #endif
// The following header file defines among other things BOOST_PREVENT_MACRO_SUBSTITUTION // The following header file defines among other things BOOST_PREVENT_MACRO_SUBSTITUTION