[Libreoffice-commits] core.git: external/boost
Michael Stahl
mstahl at redhat.com
Thu May 26 18:26:21 UTC 2016
external/boost/UnpackedTarball_boost.mk | 8 -
external/boost/boost.crc.Wshadow.warnings.patch | 21 ---
external/boost/boost.random.Wunused-local-typedefs.warnings.patch | 11 -
external/boost/boost.signal2.Wshadow.warnings.patch | 15 --
external/boost/boost_1_44_0-clang-warnings.patch | 70 ----------
external/boost/boost_1_44_0-unused-parameters.patch | 38 -----
external/boost/boost_1_59_0.multi_array.wshadow.patch | 21 ---
external/boost/boost_1_59_0.property_tree.wshadow.patch | 21 +++
8 files changed, 21 insertions(+), 184 deletions(-)
New commits:
commit 423f709ad78b2de2f29484cf444a429018c1b246
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu May 26 13:59:48 2016 +0200
boost: remove patches for headers that are no longer used
The following libraries are mostly or completely unused on current
master, in MSVC 2013 and GCC builds:
* crc
* dynamic_bitset
* ptr_container
* random
* signal2
That's much less removal than we hoped, but it turns out that a lot of
boost headers include other boost headers, so removing includes in LO
code only goes this far.
Also move one property_tree hunk from a wrong patch file to more
approriate one.
Change-Id: I6ad3a5987b025a57ca92402cca9a0e1f659128e9
Reviewed-on: https://gerrit.libreoffice.org/25513
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 728b3c3..e446e99 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -17,8 +17,6 @@ boost_patches += boost.6369.warnings.patch
#https://svn.boost.org/trac/boost/ticket/6142
boost_patches += boost.6142.warnings.patch.1
-# https://svn.boost.org/trac/boost/ticket/9881
-boost_patches += boost.crc.Wshadow.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9882
boost_patches += boost.date_time.Wshadow.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9885
@@ -29,8 +27,6 @@ boost_patches += boost.multi_array.Wunused-local-typedefs.warnings.patch
boost_patches += boost.preprocessor.Wundef.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9892
boost_patches += boost.property_tree.Wshadow.warnings.patch.1
-# fixed upstream
-boost_patches += boost.random.Wunused-local-typedefs.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9900
boost_patches += boost.spirit.Wshadow.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9901
@@ -46,13 +42,9 @@ ifeq (GCC,$(COM))
boost_patches += boost_1_44_0-unused-parameters.patch
endif
-# Clang warnings:
-boost_patches += boost_1_44_0-clang-warnings.patch
-
boost_patches += boost.auto_link.patch
boost_patches += boost.std.move.patch
boost_patches += boost.wunused.patch
-boost_patches += boost.signal2.Wshadow.warnings.patch
boost_patches += ubsan.patch.0
boost_patches += rtti.patch.0
diff --git a/external/boost/boost.crc.Wshadow.warnings.patch b/external/boost/boost.crc.Wshadow.warnings.patch
deleted file mode 100644
index e83615a..0000000
--- a/external/boost/boost.crc.Wshadow.warnings.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) );
- }
diff --git a/external/boost/boost.random.Wunused-local-typedefs.warnings.patch b/external/boost/boost.random.Wunused-local-typedefs.warnings.patch
deleted file mode 100644
index 73f8c0b..0000000
--- a/external/boost/boost.random.Wunused-local-typedefs.warnings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru boost.orig/boost/random/generate_canonical.hpp boost/boost/random/generate_canonical.hpp
---- a/b/boost.orig/boost/random/generate_canonical.hpp 2015-02-27 18:44:45.000000000 +0100
-+++ a/b/boost/boost/random/generate_canonical.hpp 2015-07-18 21:55:44.152972440 +0200
-@@ -32,7 +32,6 @@
- RealType generate_canonical_impl(URNG& g, boost::mpl::true_ /*is_integral*/)
- {
- using std::pow;
-- typedef typename URNG::result_type base_result;
- std::size_t digits = std::numeric_limits<RealType>::digits;
- RealType R = RealType((g.max)()) - RealType((g.min)()) + 1;
- RealType mult = R;
diff --git a/external/boost/boost.signal2.Wshadow.warnings.patch b/external/boost/boost.signal2.Wshadow.warnings.patch
deleted file mode 100644
index 96db621..0000000
--- a/external/boost/boost.signal2.Wshadow.warnings.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- misc/boost_1_44_0/boost/signals2/detail/slot_template.hpp
-+++ misc/build/boost_1_44_0/boost/signals2/detail/slot_template.hpp
-@@ -117,10 +117,10 @@
- track_signal(signal);
- return *this;
- }
-- BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)& track(const slot_base &slot)
-+ BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)& track(const slot_base &slotitem)
- {
- tracked_container_type::const_iterator it;
-- for(it = slot.tracked_objects().begin(); it != slot.tracked_objects().end(); ++it)
-+ for(it = slotitem.tracked_objects().begin(); it != slotitem.tracked_objects().end(); ++it)
- {
- _tracked_objects.push_back(*it);
- }
diff --git a/external/boost/boost_1_44_0-clang-warnings.patch b/external/boost/boost_1_44_0-clang-warnings.patch
deleted file mode 100644
index a71cc2f..0000000
--- a/external/boost/boost_1_44_0-clang-warnings.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp
-+++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp
-@@ -16,6 +16,11 @@
- #ifndef BOOST_RANDOM_LAGGED_FIBONACCI_HPP
- #define BOOST_RANDOM_LAGGED_FIBONACCI_HPP
-
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
-+# pragma GCC diagnostic push
-+# pragma GCC diagnostic ignored "-Wshadow"
-+#endif
-+
- #include <istream>
- #include <iosfwd>
- #include <algorithm> // std::max
-@@ -537,4 +537,8 @@
-
- } // namespace boost
-
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
-+# pragma GCC diagnostic pop
-+#endif
-+
- #endif // BOOST_RANDOM_LAGGED_FIBONACCI_HPP
---- misc/boost_1_44_0/boost/random/shuffle_output.hpp
-+++ misc/build/boost_1_44_0/boost/random/shuffle_output.hpp
-@@ -16,6 +16,11 @@
- #ifndef BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
- #define BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
-
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
-+# pragma GCC diagnostic push
-+# pragma GCC diagnostic ignored "-Wshadow"
-+#endif
-+
- #include <boost/random/shuffle_order.hpp>
-
- namespace boost {
-@@ -52,4 +52,8 @@
- }
- }
-
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
-+# pragma GCC diagnostic pop
-+#endif
-+
- #endif // BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
---- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp
-+++ misc/build/boost_1_44_0/boost/random/subtract_with_carry.hpp
-@@ -16,6 +16,11 @@
- #ifndef BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
- #define BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
-
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
-+# pragma GCC diagnostic push
-+# pragma GCC diagnostic ignored "-Wshadow"
-+#endif
-+
- #include <boost/config/no_tr1/cmath.hpp> // std::pow
- #include <iostream>
- #include <algorithm> // std::equal
-@@ -614,4 +614,8 @@
- } // namespace random
- } // namespace boost
-
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
-+# pragma GCC diagnostic pop
-+#endif
-+
- #endif // BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
-
diff --git a/external/boost/boost_1_44_0-unused-parameters.patch b/external/boost/boost_1_44_0-unused-parameters.patch
index 174513b..2fd02cf 100644
--- a/external/boost/boost_1_44_0-unused-parameters.patch
+++ b/external/boost/boost_1_44_0-unused-parameters.patch
@@ -608,20 +608,6 @@ diff -ru boost.orig/boost/bind/mem_fn_template.hpp boost/boost/bind/mem_fn_templ
{
BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4);
}
-diff -ru boost.orig/boost/detail/dynamic_bitset.hpp boost/boost/detail/dynamic_bitset.hpp
---- foo/misc/boost.orig/boost/detail/dynamic_bitset.hpp 2015-06-04 07:43:44.000000000 +0200
-+++ foo/misc/boost/boost/detail/dynamic_bitset.hpp 2015-07-16 21:59:20.786982818 +0200
-@@ -104,8 +104,8 @@
-
- template <typename Iterator>
- inline std::size_t do_count(Iterator first, std::size_t length,
-- int /*dummy param*/,
-- value_to_type<access_by_bytes>* )
-+ __attribute__ ((unused)) int /*dummy param*/,
-+ __attribute__ ((unused)) value_to_type<access_by_bytes>* )
- {
- std::size_t num = 0;
- if (length)
diff -ru boost.orig/boost/foreach.hpp boost/boost/foreach.hpp
--- foo/misc/boost.orig/boost/foreach.hpp 2015-03-04 21:36:38.000000000 +0100
+++ foo/misc/boost/boost/foreach.hpp 2015-07-16 22:01:53.617981100 +0200
@@ -763,30 +749,6 @@ diff -ru boost.orig/boost/optional/optional.hpp boost/boost/optional/optional.hp
{ return bool(y); }
template<class T>
-diff -ru boost.orig/boost/ptr_container/detail/default_deleter.hpp boost/boost/ptr_container/detail/default_deleter.hpp
---- foo/misc/boost.orig/boost/ptr_container/detail/default_deleter.hpp 2015-01-25 20:27:11.000000000 +0100
-+++ foo/misc/boost/boost/ptr_container/detail/default_deleter.hpp 2015-07-16 22:45:54.427951420 +0200
-@@ -61,7 +61,7 @@
- {
- default_deleter() { }
- template<typename TT>
-- default_deleter(default_deleter<TT> tt) { }
-+ default_deleter(__attribute__ ((unused)) default_deleter<TT> tt) { }
- };
-
- } } } // End namespaces ptr_container_detail, move_ptrs, boost.
-diff -ru boost.orig/boost/ptr_container/ptr_sequence_adapter.hpp boost/boost/ptr_container/ptr_sequence_adapter.hpp
---- foo/misc/boost.orig/boost/ptr_container/ptr_sequence_adapter.hpp 2015-07-16 08:47:41.786947347 +0200
-+++ foo/misc/boost/boost/ptr_container/ptr_sequence_adapter.hpp 2015-07-16 22:46:28.137951041 +0200
-@@ -664,7 +664,7 @@
-
- }
-
-- void range_check_impl( iterator first, iterator last,
-+ void range_check_impl( __attribute__ ((unused)) iterator first, __attribute__ ((unused)) iterator last,
- std::bidirectional_iterator_tag )
- { /* do nothing */ }
-
diff -ru boost.orig/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp boost/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp
--- foo/misc/boost.orig/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp 2015-05-17 14:17:51.000000000 +0200
+++ foo/misc/boost/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp 2015-07-16 22:07:32.910977287 +0200
diff --git a/external/boost/boost_1_59_0.multi_array.wshadow.patch b/external/boost/boost_1_59_0.multi_array.wshadow.patch
index 1f7b28a..c988a9b 100644
--- a/external/boost/boost_1_59_0.multi_array.wshadow.patch
+++ b/external/boost/boost_1_59_0.multi_array.wshadow.patch
@@ -482,24 +482,3 @@ diff -ru boost.org/boost/multi_array.hpp boost/boost/multi_array.hpp
}
return this->resize(ranges);
-diff -ru boost.org/boost/property_tree/detail/json_parser/wide_encoding.hpp boost/boost/property_tree/detail/json_parser/wide_encoding.hpp
---- foo/misc/boost.org/boost/property_tree/detail/json_parser/wide_encoding.hpp 2015-07-07 14:20:48.000000000 +0200
-+++ foo/misc/boost/boost/property_tree/detail/json_parser/wide_encoding.hpp 2015-07-22 06:51:07.089598136 +0200
-@@ -104,7 +104,7 @@
-
- template <typename Iterator, typename Sentinel, typename TranscodedFn,
- typename EncodingErrorFn>
-- void transcode_codepoint(Iterator& cur, Sentinel end,
-+ void transcode_codepoint(Iterator& cur, Sentinel,
- TranscodedFn transcoded_fn,
- EncodingErrorFn error_fn,
- is_utf16<false>) const {
-@@ -117,7 +117,7 @@
- }
- template <typename Iterator, typename Sentinel, typename TranscodedFn,
- typename EncodingErrorFn>
-- void transcode_codepoint(Iterator& cur, Sentinel end,
-+ void transcode_codepoint(Iterator& cur, Sentinel,
- TranscodedFn transcoded_fn,
- EncodingErrorFn error_fn,
- is_utf16<true>) const {
diff --git a/external/boost/boost_1_59_0.property_tree.wshadow.patch b/external/boost/boost_1_59_0.property_tree.wshadow.patch
index 8cd0b33..3b93bba 100644
--- a/external/boost/boost_1_59_0.property_tree.wshadow.patch
+++ b/external/boost/boost_1_59_0.property_tree.wshadow.patch
@@ -81,3 +81,24 @@ diff -ru boost.orig/boost/property_tree/detail/json_parser/parser.hpp boost/boos
{}
template <typename Range>
+diff -ru boost.org/boost/property_tree/detail/json_parser/wide_encoding.hpp boost/boost/property_tree/detail/json_parser/wide_encoding.hpp
+--- foo/misc/boost.org/boost/property_tree/detail/json_parser/wide_encoding.hpp 2015-07-07 14:20:48.000000000 +0200
++++ foo/misc/boost/boost/property_tree/detail/json_parser/wide_encoding.hpp 2015-07-22 06:51:07.089598136 +0200
+@@ -104,7 +104,7 @@
+
+ template <typename Iterator, typename Sentinel, typename TranscodedFn,
+ typename EncodingErrorFn>
+- void transcode_codepoint(Iterator& cur, Sentinel end,
++ void transcode_codepoint(Iterator& cur, Sentinel,
+ TranscodedFn transcoded_fn,
+ EncodingErrorFn error_fn,
+ is_utf16<false>) const {
+@@ -117,7 +117,7 @@
+ }
+ template <typename Iterator, typename Sentinel, typename TranscodedFn,
+ typename EncodingErrorFn>
+- void transcode_codepoint(Iterator& cur, Sentinel end,
++ void transcode_codepoint(Iterator& cur, Sentinel,
+ TranscodedFn transcoded_fn,
+ EncodingErrorFn error_fn,
+ is_utf16<true>) const {
More information about the Libreoffice-commits
mailing list