Annotation of /trunk/qt-gstreamer/patches/qt-gstreamer-1.2.0-boost157.patch
Parent Directory | Revision Log
Revision 2596 -
(hide annotations)
(download)
Wed Jun 24 11:26:51 2015 UTC (9 years, 3 months ago) by niro
File size: 1108 byte(s)
Wed Jun 24 11:26:51 2015 UTC (9 years, 3 months ago) by niro
File size: 1108 byte(s)
-fixed build against >=boost-1.57
1 | niro | 2596 | From fbb9dc6e291eaa058f3ef1cd93711265bfbfd162 Mon Sep 17 00:00:00 2001 |
2 | From: Heiko Becker <heirecka@exherbo.org> | ||
3 | Date: Fri, 7 Nov 2014 00:11:02 +0100 | ||
4 | Subject: [PATCH] Workaround build failures with boost>=1.57 and moc | ||
5 | |||
6 | Otherwise I get the following error message: | ||
7 | 'usr/include/boost/type_traits/detail/has_binary_operator.hp:50: | ||
8 | Parse error at "BOOST_JOIN"'. See | ||
9 | https://bugreports.qt-project.org/browse/QTBUG-22829 for details. | ||
10 | |||
11 | The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED | ||
12 | doesn't seem to work here. | ||
13 | --- | ||
14 | src/QGlib/connect.cpp | 2 ++ | ||
15 | 1 file changed, 2 insertions(+) | ||
16 | |||
17 | diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp | ||
18 | index 9ff6fde..58a3367 100644 | ||
19 | --- a/src/QGlib/connect.cpp | ||
20 | +++ b/src/QGlib/connect.cpp | ||
21 | @@ -21,8 +21,10 @@ | ||
22 | #include <QtCore/QHash> | ||
23 | #include <QtCore/QMutex> | ||
24 | #include <boost/multi_index_container.hpp> | ||
25 | +#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 | ||
26 | #include <boost/multi_index/sequenced_index.hpp> | ||
27 | #include <boost/multi_index/ordered_index.hpp> | ||
28 | +#endif | ||
29 | #include <boost/multi_index/member.hpp> | ||
30 | |||
31 | namespace QGlib { | ||
32 | -- | ||
33 | 2.1.3 | ||
34 |