From cf71223c328025efe60215c7774fd87f7941a7b3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 26 Nov 2012 09:42:12 +0100 Subject: error: declaration of ‘bit_count’ shadows a previous local MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I411945fafce71c327d137a2dd09501fa98cc31c2 --- boost/UnpackedTarball_boost.mk | 2 ++ boost/boost_1_44_0-crc-shadow-warning.patch | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 boost/boost_1_44_0-crc-shadow-warning.patch (limited to 'boost') diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 8035da2c03d9..35c76edc2695 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -50,6 +50,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch # in GCC-4.7 experimental": boost_patches += boost_1_44_0-gthreads.patch +boost_patches += boost_1_44_0-crc-shadow-warning.patch + $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) diff --git a/boost/boost_1_44_0-crc-shadow-warning.patch b/boost/boost_1_44_0-crc-shadow-warning.patch new file mode 100644 index 000000000000..e83615a88d71 --- /dev/null +++ b/boost/boost_1_44_0-crc-shadow-warning.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::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(bits & high_bit_mask) ); + } -- cgit