boost/UnpackedTarball_boost.mk | 2 --
boost/boost.6397.warnings.patch | 21 +++++++++++++++++++++
boost/boost_1_44_0-crc-shadow-warning.patch | 21 ---------------------
3 files changed, 21 insertions(+), 23 deletions(-)
New commits:
commit 9f12780c94e192949b2823552cfdd7d3d513277d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Nov 26 10:46:54 2012 +0100
Fold boost crc-shadow-warning.patch into 6397.warnings.patch
Change-Id: Idcb00cba13ae3d7d5ee6288065c98accf636142d
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 35c76ed..8035da2 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -50,8 +50,6 @@ 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.6397.warnings.patch b/boost/boost.6397.warnings.patch
index d41df08..cf24c9e 100644
--- a/boost/boost.6397.warnings.patch
+++ b/boost/boost.6397.warnings.patch
@@ -1,3 +1,24 @@
+--- 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/collection_concept.hpp 2012-01-12
20:21:29.790009198 +0000
+++ misc/build/boost_1_44_0/boost/multi_array/collection_concept.hpp
2012-01-12 20:28:55.457287835 +0000
@@ -43,11 +43,11 @@
diff --git a/boost/boost_1_44_0-crc-shadow-warning.patch
b/boost/boost_1_44_0-crc-shadow-warning.patch
deleted file mode 100644
index e83615a..0000000
--- a/boost/boost_1_44_0-crc-shadow-warning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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) );
- }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
