From 942f13c26b825a656646f6ffa07d5bf9dc2f0a3c Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Fri, 30 Sep 2016 11:12:19 +0200 Subject: [PATCH] Update list of boost headers that break Qt4 moc. --- Installation/include/CGAL/config.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 0e960f5ad7b..c500d84dc39 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -58,8 +58,9 @@ // https://bugreports.qt-project.org/browse/QTBUG-22829 #ifdef Q_MOC_RUN // When Qt moc runs on CGAL files, do not process -// +// # 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_OR_HPP_INCLUDED # define BOOST_TT_HAS_BIT_OR_ASSIGN_HPP_INCLUDED @@ -90,6 +91,18 @@ // do not include either // it includes # define BOOST_RANDOM_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 +// fails as well +# define BOOST_TT_HAS_POST_DECREMENT_HPP_INCLUDED +# define BOOST_TT_HAS_POST_INCREMENT_HPP_INCLUDED #endif // The following header file defines among other things BOOST_PREVENT_MACRO_SUBSTITUTION