Author: hdu
Date: Thu Apr 18 09:14:55 2013
New Revision: 1469234
URL: http://svn.apache.org/r1469234
Log:
WaE: get rid of gazillions of Wshadow warnings when using boost unordered_*
containers
the changes to emplace_args.hpp are from the boost 1.50 version
Modified:
openoffice/trunk/main/boost/boost_1_48_0.patch
Modified: openoffice/trunk/main/boost/boost_1_48_0.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/boost/boost_1_48_0.patch?rev=1469234&r1=1469233&r2=1469234&view=diff
==============================================================================
--- openoffice/trunk/main/boost/boost_1_48_0.patch (original)
+++ openoffice/trunk/main/boost/boost_1_48_0.patch Thu Apr 18 09:14:55 2013
@@ -161,3 +161,40 @@ diff -ru misc/boost_1_48_0/boost/spirit/
).second;
}
+diff -ru misc/boost_1_48_0/boost/unordered/detail/emplace_args.hpp
misc/build/boost_1_48_0/boost/unordered/detail/emplace_args.hpp
+--- misc/boost_1_48_0/boost/unordered/detail/emplace_args.hpp
++++ misc/build/boost_1_48_0/boost/unordered/detail/emplace_args.hpp
+@@ -89,5 +89,5 @@
+ BOOST_PP_REPEAT_##z(n, BOOST_UNORDERED_EARGS_MEMBER, _) \
+ BOOST_PP_CAT(emplace_args, n) ( \
+- BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, Arg, a) \
++ BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, Arg, b) \
+ ) : BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_EARGS_INIT, _) \
+ {} \
+@@ -99,10 +99,10 @@
+ BOOST_PP_ENUM_PARAMS_Z(z, n, A) \
+ > create_emplace_args( \
+- BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_FWD_PARAM, a) \
++ BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_FWD_PARAM, b) \
+ ) \
+ { \
+ BOOST_PP_CAT(emplace_args, n) < \
+ BOOST_PP_ENUM_PARAMS_Z(z, n, A) \
+- > e(BOOST_PP_ENUM_PARAMS_Z(z, n, a)); \
++ > e(BOOST_PP_ENUM_PARAMS_Z(z, n, b)); \
+ return e; \
+ }
+@@ -116,5 +116,5 @@
+ #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \
+ BOOST_PP_CAT(a, n)( \
+- boost::forward<BOOST_PP_CAT(A,n)>(BOOST_PP_CAT(a, n)))
++ boost::forward<BOOST_PP_CAT(A,n)>(BOOST_PP_CAT(b, n)))
+
+ #else
+@@ -126,5 +126,5 @@
+
+ #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \
+- BOOST_PP_CAT(a, n)(BOOST_PP_CAT(a, n))
++ BOOST_PP_CAT(a, n)(BOOST_PP_CAT(b, n))
+
+ #endif
