boost/UnpackedTarball_boost.mk | 1
boost/boost.wconstexpr-not-const.patch.0 | 43 +++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
New commits:
commit 07e756f5b9fa5d499de8f3e3ad61ee66d336a349
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu May 30 17:52:01 2013 +0200
-Werror,-Wconstexpr-not-const
...at least current trunk towards Clang 3.4 complains "'constexpr'
non-static
member function will not be implicitly 'const' in C++1y; add 'const' to
avoid a
change in behavior."
Change-Id: Id3d1af263040fdea2c2f5d0bc6a037d7a17184bd
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 99fb92a..fefe8fa 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -43,6 +43,7 @@ boost_patches += boost.std.move.patch
boost_patches += boost.wundef.patch
boost_patches += boost.wunused.patch
boost_patches += boost.wshadow.patch
+boost_patches += boost.wconstexpr-not-const.patch.0
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/boost/boost.wconstexpr-not-const.patch.0
b/boost/boost.wconstexpr-not-const.patch.0
new file mode 100644
index 0000000..26049be
--- /dev/null
+++ b/boost/boost.wconstexpr-not-const.patch.0
@@ -0,0 +1,43 @@
+--- boost/chrono/duration.hpp
++++ boost/chrono/duration.hpp
+@@ -663,36 +663,36 @@
+ template <class LhsDuration, class RhsDuration>
+ struct duration_eq
+ {
+- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const
RhsDuration& rhs)
++ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const
RhsDuration& rhs) const
+ {
+ typedef typename common_type<LhsDuration, RhsDuration>::type CD;
+ return CD(lhs).count() == CD(rhs).count();
+ }
+ };
+
+ template <class LhsDuration>
+ struct duration_eq<LhsDuration, LhsDuration>
+ {
+- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const
LhsDuration& rhs)
++ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const
LhsDuration& rhs) const
+ {
+ return lhs.count() == rhs.count();
+ }
+ };
+
+ template <class LhsDuration, class RhsDuration>
+ struct duration_lt
+ {
+- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const
RhsDuration& rhs)
++ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const
RhsDuration& rhs) const
+ {
+ typedef typename common_type<LhsDuration, RhsDuration>::type CD;
+ return CD(lhs).count() < CD(rhs).count();
+ }
+ };
+
+ template <class LhsDuration>
+ struct duration_lt<LhsDuration, LhsDuration>
+ {
+- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const
LhsDuration& rhs)
++ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const
LhsDuration& rhs) const
+ {
+ return lhs.count() < rhs.count();
+ }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
