boost/boost.wundef.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit 474d5e7e3a9c9d62bf29154c531a112d996cd480
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Aug 23 11:16:04 2013 +0300
Fix warning: BOOST_MSVC is not defined
Change-Id: I99d542af1b0d5ba68cad23512bad275aed83f0fd
diff --git a/boost/boost.wundef.patch b/boost/boost.wundef.patch
index 6dbfb4a..d453814 100644
--- a/boost/boost.wundef.patch
+++ b/boost/boost.wundef.patch
@@ -106,3 +106,14 @@
# define BOOST_PP_VARIADIC_SIZE(...)
BOOST_PP_CAT(BOOST_PP_VARIADIC_SIZE_I(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58,
57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38,
37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18,
17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,),)
# else
# define BOOST_PP_VARIADIC_SIZE(...)
BOOST_PP_VARIADIC_SIZE_I(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55,
54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35,
34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15,
14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,)
+--- foo/foo/foo/boost/utility/result_of.hpp
++++ foo/foo/foo/boost/utility/result_of.hpp
+@@ -72,7 +72,7 @@
+ // There doesn't seem to be any other way to turn this off such that the
presence of
+ // the user-defined operator,() below doesn't cause spurious warning all over
the place,
+ // so unconditionally turn it off.
+-#if BOOST_MSVC
++#if defined(BOOST_MSVC) && BOOST_MSVC
+ # pragma warning(disable: 4913) // user defined binary operator ',' exists
but no overload could convert all operands, default built-in binary operator
',' used
+ #endif
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
