Kaydet (Commit) c0def0a4 authored tarafından Michael Stahl's avatar Michael Stahl

boost: split boost.wundef.patch

Change-Id: I16c2235dd72f86b7659d92aa1c72b573ccadacb7
üst ce481713
......@@ -27,7 +27,10 @@ boost_patches += boost.date_time.Wshadow.warnings.patch
boost_patches += boost.math.Wdeprecated-register.patch.0
boost_patches += boost.multi_array.C4510.warnings.patch
boost_patches += boost.multi_array.Wshadow.warnings.patch
boost_patches += boost.multi_array.Wundef.warnings.patch
boost_patches += boost.multi_index.Wshadow.warnings.patch.1
boost_patches += boost.predef.Wundef.warnings.patch
boost_patches += boost.preprocessor.Wundef.warnings.patch
boost_patches += boost.property_tree.Wshadow.warnings.patch.1
boost_patches += boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0
boost_patches += boost.ptr_container.Wshadow.warnings.patch
......@@ -38,6 +41,7 @@ boost_patches += boost.random.Wshadow.warnings.patch
boost_patches += boost.random.Wuninitialized.patch
boost_patches += boost.spirit.Wshadow.warnings.patch
boost_patches += boost.unordered.Wshadow.warnings.patch
boost_patches += boost.utility.Wundef.warnings.patch
boost_patches += boost.uuid.Wshadow.warnings.patch
# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
......@@ -55,7 +59,6 @@ boost_patches += boost.endian.patch
boost_patches += boost.loplugin.patch
boost_patches += boost.std.move.patch
boost_patches += boost.transform_width.patch
boost_patches += boost.wundef.patch
boost_patches += boost.wunused.patch
boost_patches += boost.wdeprecated-auto_ptr.patch.0
......
--- foo/foo/foo/boost/multi_array/base.hpp
+++ foo/foo/foo/boost/multi_array/base.hpp
@@ -65,7 +65,7 @@
// object creation in small-memory environments. Thus, the objects
// can be left undefined by defining BOOST_MULTI_ARRAY_NO_GENERATORS
// before loading multi_array.hpp.
-#if !BOOST_MULTI_ARRAY_NO_GENERATORS
+#if !defined(BOOST_MULTI_ARRAY_NO_GENERATORS) || !BOOST_MULTI_ARRAY_NO_GENERATORS
namespace {
multi_array_types::extent_gen extents;
multi_array_types::index_gen indices;
--- foo/foo/foo/boost/predef/other/endian.h
+++ foo/foo/foo/boost/predef/other/endian.h
@@ -77,7 +77,7 @@
# undef BOOST_ENDIAN_LITTLE_BYTE
# define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE
# endif
-# if (__BYTE_ORDER == __PDP_ENDIAN)
+# if defined(__PDP_ENDIAN) && (__BYTE_ORDER == __PDP_ENDIAN)
# undef BOOST_ENDIAN_LITTLE_WORD
# define BOOST_ENDIAN_LITTLE_WORD BOOST_VERSION_NUMBER_AVAILABLE
# endif
--- foo/foo/foo/boost/predef/other/endian.h
+++ foo/foo/foo/boost/predef/other/endian.h
@@ -77,7 +77,7 @@
# undef BOOST_ENDIAN_LITTLE_BYTE
# define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE
# endif
-# if (__BYTE_ORDER == __PDP_ENDIAN)
+# if defined(__PDP_ENDIAN) && (__BYTE_ORDER == __PDP_ENDIAN)
# undef BOOST_ENDIAN_LITTLE_WORD
# define BOOST_ENDIAN_LITTLE_WORD BOOST_VERSION_NUMBER_AVAILABLE
# endif
--- foo/foo/foo/boost/multi_array/base.hpp
+++ foo/foo/foo/boost/multi_array/base.hpp
@@ -65,7 +65,7 @@
// object creation in small-memory environments. Thus, the objects
// can be left undefined by defining BOOST_MULTI_ARRAY_NO_GENERATORS
// before loading multi_array.hpp.
-#if !BOOST_MULTI_ARRAY_NO_GENERATORS
+#if !defined(BOOST_MULTI_ARRAY_NO_GENERATORS) || !BOOST_MULTI_ARRAY_NO_GENERATORS
namespace {
multi_array_types::extent_gen extents;
multi_array_types::index_gen indices;
--- foo/foo/foo/boost/preprocessor/config/config.hpp
+++ foo/foo/foo/boost/preprocessor/config/config.hpp
@@ -90,7 +90,7 @@
......@@ -86,14 +64,3 @@
# 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
--- 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment