- Fix build with boost 1.60

PR:		199601
This commit is contained in:
Dmitry Marakasov 2016-02-13 01:26:10 +00:00
parent fac6283415
commit d97a8fd8f7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=408773
6 changed files with 80 additions and 0 deletions

View file

@ -0,0 +1,16 @@
--- src/QGlib/connect.cpp.orig 2013-10-14 08:44:40 UTC
+++ src/QGlib/connect.cpp
@@ -20,10 +20,13 @@
#include <glib-object.h>
#include <QtCore/QHash>
#include <QtCore/QMutex>
+
+#ifndef Q_MOC_RUN
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/sequenced_index.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/member.hpp>
+#endif
namespace QGlib {
namespace Private {

View file

@ -0,0 +1,14 @@
--- src/QGlib/connect.h.orig 2013-10-14 08:44:40 UTC
+++ src/QGlib/connect.h
@@ -25,8 +25,11 @@
#include <QtCore/QSharedPointer>
#include <QtCore/QFlags>
#include <QtCore/QHash>
+
+#ifndef Q_MOC_RUN
#include <boost/type_traits.hpp>
#include <boost/utility/enable_if.hpp>
+#endif
namespace QGlib {

View file

@ -0,0 +1,12 @@
--- src/QGlib/connectimpl.h.orig 2013-10-14 08:44:40 UTC
+++ src/QGlib/connectimpl.h
@@ -26,7 +26,9 @@
# include "refpointer.h"
# include <QtCore/QList>
# include <stdexcept>
+#ifndef Q_MOC_RUN
# include <boost/type_traits.hpp>
+#endif
namespace QGlib {

View file

@ -0,0 +1,13 @@
--- src/QGlib/refpointer.h.orig 2013-10-14 08:44:40 UTC
+++ src/QGlib/refpointer.h
@@ -23,8 +23,10 @@
#include "type.h"
#include "wrap.h"
#include <cstddef>
+#ifndef Q_MOC_RUN
#include <boost/type_traits.hpp>
#include <boost/utility/enable_if.hpp>
+#endif
#include <QtCore/QHash>
namespace QGlib {

View file

@ -0,0 +1,12 @@
--- src/QGlib/type.h.orig 2013-10-14 08:44:40 UTC
+++ src/QGlib/type.h
@@ -21,7 +21,9 @@
#include "global.h"
#include <QtCore/QList>
+#ifndef Q_MOC_RUN
#include <boost/mpl/if.hpp>
+#endif
/*
* This is a re-definition of GType inside the QGlib::Private namespace.

View file

@ -0,0 +1,13 @@
--- src/QGlib/value.h.orig 2013-10-14 08:44:40 UTC
+++ src/QGlib/value.h
@@ -23,8 +23,10 @@
#include "type.h"
#include "refpointer.h"
#include "error.h"
+#ifndef Q_MOC_RUN
#include <boost/mpl/if.hpp>
#include <boost/type_traits.hpp>
+#endif
#include <stdexcept>
#include <QtCore/QString>
#include <QtCore/QDebug>