summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-04-13 18:23:47 +0200
committerMichael Stahl <mstahl@redhat.com>2014-04-14 17:42:25 +0200
commitb5f60ca53fc29548b3cee83e8fdd638a2995bad2 (patch)
treedd341fe17dc1e4b34542834c00aad357edb9593b /external
parent3413e03c077ff9bf8f412e57be4bd5336d01a7af (diff)
boost: split up boost.6397.warnings.patch by module
Change-Id: I8cf46ebbe5b17109e9ab2a13ed7c50cc48d6eae4
Diffstat (limited to 'external')
-rw-r--r--external/boost/UnpackedTarball_boost.mk6
-rw-r--r--external/boost/boost.crc.Wshadow.warnings.patch21
-rw-r--r--external/boost/boost.multi_array.Wshadow.warnings.patch (renamed from external/boost/boost.6397.warnings.patch)76
-rw-r--r--external/boost/boost.random.Wshadow.warnings.patch29
-rw-r--r--external/boost/boost.uuid.Wshadow.warnings.patch24
5 files changed, 79 insertions, 77 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 44efd984be2a..47a77aeb7078 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -14,8 +14,6 @@ boost_patches += boost.3780.aliasing.patch
boost_patches += boost.gcc47679.patch
#https://svn.boost.org/trac/boost/ticket/6369
boost_patches += boost.6369.warnings.patch
-#https://svn.boost.org/trac/boost/ticket/6397
-boost_patches += boost.6397.warnings.patch
#https://svn.boost.org/trac/boost/ticket/7551
boost_patches += boost.7551.unusedvars.patch
boost_patches += boost.4100.warnings.patch
@@ -23,12 +21,16 @@ boost_patches += boost.4510.warnings.patch
#https://svn.boost.org/trac/boost/ticket/6142
boost_patches += boost.6142.warnings.patch.1
+boost_patches += boost.crc.Wshadow.warnings.patch
boost_patches += boost.date_time.Wshadow.warnings.patch
+boost_patches += boost.multi_array.Wshadow.warnings.patch
boost_patches += boost.ptr_container.Wshadow.warnings.patch
boost_patches += boost.ptr_container.Wignored-qualifiers.warnings.patch
boost_patches += boost.ptr_container.Wextra.warnings.patch
boost_patches += boost.ptr_container.Wunused-parameter.warnings.patch
+boost_patches += boost.random.Wshadow.warnings.patch
boost_patches += boost.spirit.Wshadow.warnings.patch
+boost_patches += boost.uuid.Wshadow.warnings.patch
boost_patches += boost.libcdr.warnings.patch.1
# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
diff --git a/external/boost/boost.crc.Wshadow.warnings.patch b/external/boost/boost.crc.Wshadow.warnings.patch
new file mode 100644
index 000000000000..e83615a88d71
--- /dev/null
+++ b/external/boost/boost.crc.Wshadow.warnings.patch
@@ -0,0 +1,21 @@
+--- misc/boost_1_44_0/boost/boost/crc.hpp
++++ misc/build/boost_1_44_0/boost/boost/crc.hpp
+@@ -755,15 +755,15 @@ void
+ crc_basic<Bits>::process_bits
+ (
+ unsigned char bits,
+- std::size_t bit_count
++ std::size_t bit_count_
+ )
+ {
+ // ignore the bits above the ones we want
+- bits <<= CHAR_BIT - bit_count;
++ bits <<= CHAR_BIT - bit_count_;
+
+ // compute the CRC for each bit, starting with the upper ones
+ unsigned char const high_bit_mask = 1u << ( CHAR_BIT - 1u );
+- for ( std::size_t i = bit_count ; i > 0u ; --i, bits <<= 1u )
++ for ( std::size_t i = bit_count_ ; i > 0u ; --i, bits <<= 1u )
+ {
+ process_bit( static_cast<bool>(bits & high_bit_mask) );
+ }
diff --git a/external/boost/boost.6397.warnings.patch b/external/boost/boost.multi_array.Wshadow.warnings.patch
index 1cb18d468fb2..661778674f78 100644
--- a/external/boost/boost.6397.warnings.patch
+++ b/external/boost/boost.multi_array.Wshadow.warnings.patch
@@ -1,24 +1,3 @@
---- misc/boost_1_44_0/boost/boost/crc.hpp
-+++ misc/build/boost_1_44_0/boost/boost/crc.hpp
-@@ -755,15 +755,15 @@ void
- crc_basic<Bits>::process_bits
- (
- unsigned char bits,
-- std::size_t bit_count
-+ std::size_t bit_count_
- )
- {
- // ignore the bits above the ones we want
-- bits <<= CHAR_BIT - bit_count;
-+ bits <<= CHAR_BIT - bit_count_;
-
- // compute the CRC for each bit, starting with the upper ones
- unsigned char const high_bit_mask = 1u << ( CHAR_BIT - 1u );
-- for ( std::size_t i = bit_count ; i > 0u ; --i, bits <<= 1u )
-+ for ( std::size_t i = bit_count_ ; i > 0u ; --i, bits <<= 1u )
- {
- process_bit( static_cast<bool>(bits & high_bit_mask) );
- }
--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp 2012-01-12 20:21:29.790009198 +0000
+++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp 2012-01-12 20:29:56.482879277 +0000
@@ -39,8 +39,8 @@
@@ -408,7 +387,7 @@
explicit const_multi_array_view(TPtr base,
const ExtentList& extents,
- const boost::array<Index,NumDims>& strides):
-+ const boost::array<Index,NumDims>& strides_):
++ const boost::array<Index,NumDims>& strides_):
base_(base), origin_offset_(0) {
index_base_list_.assign(0);
@@ -513,56 +492,3 @@
std::transform(new_array.index_base_list_.begin(),
new_array.index_base_list_.end(),
---- misc/boost_1_44_0/boost/random/mersenne_twister.hpp
-+++ misc/build/boost_1_44_0/boost/random/mersenne_twister.hpp
-@@ -195,19 +195,19 @@
- * Returns true if the two generators are in the same state,
- * and will thus produce identical sequences.
- */
-- friend bool operator==(const mersenne_twister_engine& x,
-- const mersenne_twister_engine& y)
-+ friend bool operator==(const mersenne_twister_engine& x_arg,
-+ const mersenne_twister_engine& y_arg)
- {
-- if(x.i < y.i) return x.equal_imp(y);
-- else return y.equal_imp(x);
-+ if(x_arg.i < y_arg.i) return x_arg.equal_imp(y_arg);
-+ else return y_arg.equal_imp(x_arg);
- }
-
- /**
- * Returns true if the two generators are in different states.
- */
-- friend bool operator!=(const mersenne_twister_engine& x,
-- const mersenne_twister_engine& y)
-- { return !(x == y); }
-+ friend bool operator!=(const mersenne_twister_engine& x_arg,
-+ const mersenne_twister_engine& y_arg)
-+ { return !(x_arg == y_arg); }
-
- private:
- /// \cond show_private
---- misc/boost_1_44_0/boost/uuid/uuid_io.hpp
-+++ misc/build/boost_1_44_0/boost/uuid/uuid_io.hpp
-@@ -59,7 +59,7 @@
- }
-
- if (flags & std::ios_base::left) {
-- for (std::streamsize i=uuid_width; i<width; i++) {
-+ for (std::streamsize s=uuid_width; s<width; ++s) {
- os << fill;
- }
- }
---- misc/boost_1_44_0/boost/uuid/name_generator.hpp
-+++ misc/build/boost_1_44_0/boost/uuid/name_generator.hpp
-@@ -30,8 +30,8 @@
- public:
- typedef uuid result_type;
-
-- explicit name_generator(uuid const& namespace_uuid)
-- : namespace_uuid(namespace_uuid)
-+ explicit name_generator(uuid const& namespace_uuid_)
-+ : namespace_uuid(namespace_uuid_)
- {}
-
- uuid operator()(const char* name) {
diff --git a/external/boost/boost.random.Wshadow.warnings.patch b/external/boost/boost.random.Wshadow.warnings.patch
new file mode 100644
index 000000000000..86b57fa18238
--- /dev/null
+++ b/external/boost/boost.random.Wshadow.warnings.patch
@@ -0,0 +1,29 @@
+--- misc/boost_1_44_0/boost/random/mersenne_twister.hpp
++++ misc/build/boost_1_44_0/boost/random/mersenne_twister.hpp
+@@ -195,19 +195,19 @@
+ * Returns true if the two generators are in the same state,
+ * and will thus produce identical sequences.
+ */
+- friend bool operator==(const mersenne_twister_engine& x,
+- const mersenne_twister_engine& y)
++ friend bool operator==(const mersenne_twister_engine& x_arg,
++ const mersenne_twister_engine& y_arg)
+ {
+- if(x.i < y.i) return x.equal_imp(y);
+- else return y.equal_imp(x);
++ if(x_arg.i < y_arg.i) return x_arg.equal_imp(y_arg);
++ else return y_arg.equal_imp(x_arg);
+ }
+
+ /**
+ * Returns true if the two generators are in different states.
+ */
+- friend bool operator!=(const mersenne_twister_engine& x,
+- const mersenne_twister_engine& y)
+- { return !(x == y); }
++ friend bool operator!=(const mersenne_twister_engine& x_arg,
++ const mersenne_twister_engine& y_arg)
++ { return !(x_arg == y_arg); }
+
+ private:
+ /// \cond show_private
diff --git a/external/boost/boost.uuid.Wshadow.warnings.patch b/external/boost/boost.uuid.Wshadow.warnings.patch
new file mode 100644
index 000000000000..b9296dc96ce1
--- /dev/null
+++ b/external/boost/boost.uuid.Wshadow.warnings.patch
@@ -0,0 +1,24 @@
+--- misc/boost_1_44_0/boost/uuid/uuid_io.hpp
++++ misc/build/boost_1_44_0/boost/uuid/uuid_io.hpp
+@@ -59,7 +59,7 @@
+ }
+
+ if (flags & std::ios_base::left) {
+- for (std::streamsize i=uuid_width; i<width; i++) {
++ for (std::streamsize s=uuid_width; s<width; ++s) {
+ os << fill;
+ }
+ }
+--- misc/boost_1_44_0/boost/uuid/name_generator.hpp
++++ misc/build/boost_1_44_0/boost/uuid/name_generator.hpp
+@@ -30,8 +30,8 @@
+ public:
+ typedef uuid result_type;
+
+- explicit name_generator(uuid const& namespace_uuid)
+- : namespace_uuid(namespace_uuid)
++ explicit name_generator(uuid const& namespace_uuid_)
++ : namespace_uuid(namespace_uuid_)
+ {}
+
+ uuid operator()(const char* name) {