diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-04-13 20:42:25 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-04-14 17:42:27 +0200 |
commit | 11230fb8415d7cea2cafb9d86698e26b3e7e625e (patch) | |
tree | dec25bbcdc131aa43e21e0c069c0383565adecdd /external/boost | |
parent | boost: split boost.wundef.patch (diff) | |
download | core-11230fb8415d7cea2cafb9d86698e26b3e7e625e.tar.gz core-11230fb8415d7cea2cafb9d86698e26b3e7e625e.zip |
boost: split boost.wunused-local-typedefs.patch
Change-Id: I3b87643c1853ceaed3d2422a7340a931bb0c5850
Diffstat (limited to 'external/boost')
10 files changed, 266 insertions, 260 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 85a7916c4b75..f8ae768d4e6c 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -21,13 +21,18 @@ boost_patches += boost.7551.unusedvars.patch #https://svn.boost.org/trac/boost/ticket/6142 boost_patches += boost.6142.warnings.patch.1 +boost_patches += boost.bind.Wunused-local-typedefs.warnings.patch boost_patches += boost.concept_check.C4100.warnings.patch +boost_patches += boost.concept_check.Wunused-local-typedefs.warnings.patch boost_patches += boost.crc.Wshadow.warnings.patch boost_patches += boost.date_time.Wshadow.warnings.patch +boost_patches += boost.date_time.Wunused-local-typedefs.warnings.patch boost_patches += boost.math.Wdeprecated-register.patch.0 +boost_patches += boost.math.Wunused-local-typedefs.warnings.patch 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_array.Wunused-local-typedefs.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 @@ -39,8 +44,11 @@ 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.random.Wuninitialized.patch +boost_patches += boost.random.Wunused-local-typedefs.warnings.patch boost_patches += boost.spirit.Wshadow.warnings.patch +boost_patches += boost.spirit.Wunused-local-typedefs.warnings.patch boost_patches += boost.unordered.Wshadow.warnings.patch +boost_patches += boost.tuple.Wunused-local-typedefs.warnings.patch boost_patches += boost.utility.Wundef.warnings.patch boost_patches += boost.uuid.Wshadow.warnings.patch @@ -52,8 +60,6 @@ endif # Clang warnings: boost_patches += boost_1_44_0-clang-warnings.patch -boost_patches += boost.wunused-local-typedefs.patch - boost_patches += boost.auto_link.patch boost_patches += boost.endian.patch boost_patches += boost.loplugin.patch diff --git a/external/boost/boost.bind.Wunused-local-typedefs.warnings.patch b/external/boost/boost.bind.Wunused-local-typedefs.warnings.patch new file mode 100644 index 000000000000..0f8c573e55a0 --- /dev/null +++ b/external/boost/boost.bind.Wunused-local-typedefs.warnings.patch @@ -0,0 +1,11 @@ +--- misc/boost_1_44_0/boost/bind/arg.hpp ++++ misc/build/boost_1_44_0/boost/bind/arg.hpp +@@ -35,6 +35,8 @@ + { + // static assert I == is_placeholder<T>::value + typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ]; ++ T_must_be_placeholder dummy; (void) dummy; ++ // silence -Werror=unused-local-typedefs (GCC 4.8) + } + }; + diff --git a/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch b/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch new file mode 100644 index 000000000000..309679441f23 --- /dev/null +++ b/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch @@ -0,0 +1,13 @@ +--- misc/boost_1_44_0/boost/concept/detail/general.hpp ++++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp +@@ -68,7 +68,9 @@ + # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \ + typedef ::boost::concepts::detail::instantiate< \ + &::boost::concepts::requirement_<ModelFnPtr>::failed> \ +- BOOST_PP_CAT(boost_concept_check,__LINE__) ++ BOOST_PP_CAT(boost_concept_check,__LINE__); \ ++ void BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)(BOOST_PP_CAT(boost_concept_check,__LINE__) *) ++ // silence -Werror=unused-local-typedefs (GCC 4.8) + + }} + diff --git a/external/boost/boost.date_time.Wunused-local-typedefs.warnings.patch b/external/boost/boost.date_time.Wunused-local-typedefs.warnings.patch new file mode 100644 index 000000000000..5d28f66f9d6e --- /dev/null +++ b/external/boost/boost.date_time.Wunused-local-typedefs.warnings.patch @@ -0,0 +1,101 @@ +--- a/b/boost/boost/date_time/gregorian/greg_facet.hpp 2013-05-31 14:03:30.476695310 +0200 ++++ a/b/boost/boost/date_time/gregorian/greg_facet.hpp 2013-05-31 14:03:22.894669713 +0200 +@@ -215,7 +215,6 @@ + { + std::istream_iterator<std::basic_string<charT>, charT> beg(is), eos; + +- typedef boost::date_time::all_date_names_put<greg_facet_config, charT> facet_def; + d = from_stream(beg, eos); + return is; + } +--- misc/boost_1_44_0/boost/date_time/date_parsing.hpp ++++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp +@@ -113,7 +113,6 @@ + spec_str = "mdy"; + } + +- typedef typename date_type::year_type year_type; + typedef typename date_type::month_type month_type; + unsigned pos = 0; + unsigned short year(0), month(0), day(0); +@@ -159,7 +158,7 @@ + parse_undelimited_date(const std::string& s) { + int offsets[] = {4,2,2}; + int pos = 0; +- typedef typename date_type::year_type year_type; ++ //typedef typename date_type::year_type year_type; + //typename date_type::ymd_type ymd((year_type::min)(),1,1); + unsigned short y = 0, m = 0, d = 0; + +--- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp ++++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp +@@ -36,7 +36,6 @@ + boost::io::ios_flags_saver iflags(os); + typedef local_date_time time_type;//::utc_time_type typename + typedef date_time::time_facet<time_type, CharT> custom_time_facet; +- typedef std::time_put<CharT> std_time_facet; + std::ostreambuf_iterator<CharT> oitr(os); + + if(std::has_facet<custom_time_facet>(os.getloc())) { +@@ -123,7 +122,6 @@ + const boost::local_time::local_time_period& p) { + boost::io::ios_flags_saver iflags(os); + typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet; +- typedef std::time_put<CharT> std_time_facet; + std::ostreambuf_iterator<CharT> oitr(os); + if (std::has_facet<custom_facet>(os.getloc())) { + std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p); +--- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp ++++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp +@@ -47,7 +47,6 @@ + const ptime& p) { + boost::io::ios_flags_saver iflags(os); + typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; +- typedef std::time_put<CharT> std_ptime_facet; + std::ostreambuf_iterator<CharT> oitr(os); + if (std::has_facet<custom_ptime_facet>(os.getloc())) + std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); +@@ -114,7 +113,6 @@ + const boost::posix_time::time_period& p) { + boost::io::ios_flags_saver iflags(os); + typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; +- typedef std::time_put<CharT> std_time_facet; + std::ostreambuf_iterator<CharT> oitr(os); + if (std::has_facet<custom_ptime_facet>(os.getloc())) { + std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); +@@ -180,7 +178,6 @@ + { + boost::io::ios_flags_saver iflags(os); + typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; +- typedef std::time_put<CharT> std_ptime_facet; + std::ostreambuf_iterator<CharT> oitr(os); + if (std::has_facet<custom_ptime_facet>(os.getloc())) + std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td); +--- misc/boost_1_44_0/boost/date_time/string_convert.hpp ++++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp +@@ -21,7 +21,6 @@ + inline + std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str) + { +- typedef std::basic_string<InputT> input_type; + typedef std::basic_string<OutputT> output_type; + output_type result; + result.insert(result.begin(), inp_str.begin(), inp_str.end()); +--- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp ++++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp +@@ -35,7 +35,6 @@ + { + typedef std::basic_string<charT> string_type; + typedef std::vector<string_type> collection_type; +- typedef std::basic_ostringstream<charT> ostream_type; + typedef std::ostreambuf_iterator<charT> ostream_iter_type; + typedef std::basic_ostringstream<charT> stringstream_type; + typedef std::time_put<charT> time_put_facet_type; +@@ -85,7 +84,6 @@ + { + typedef std::basic_string<charT> string_type; + typedef std::vector<string_type> collection_type; +- typedef std::basic_ostringstream<charT> ostream_type; + typedef std::ostreambuf_iterator<charT> ostream_iter_type; + typedef std::basic_ostringstream<charT> stringstream_type; + typedef std::time_put<charT> time_put_facet_type; diff --git a/external/boost/boost.math.Wunused-local-typedefs.warnings.patch b/external/boost/boost.math.Wunused-local-typedefs.warnings.patch new file mode 100644 index 000000000000..e74c149f9e94 --- /dev/null +++ b/external/boost/boost.math.Wunused-local-typedefs.warnings.patch @@ -0,0 +1,34 @@ +--- a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:02:13.660436127 +0200 ++++ a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:01:17.372246240 +0200 +@@ -339,7 +338,6 @@ + { //!< \brief return true if floating-point type t is finite. + typedef detail::fp_traits<long double>::type traits; + typedef traits::method method; +- typedef boost::is_floating_point<long double>::type fp_tag; + typedef long double value_type; + return detail::isfinite_impl(static_cast<value_type>(x), method()); + } +@@ -410,7 +407,6 @@ + { + typedef detail::fp_traits<long double>::type traits; + typedef traits::method method; +- typedef boost::is_floating_point<long double>::type fp_tag; + typedef long double value_type; + return detail::isnormal_impl(static_cast<value_type>(x), method()); + } +@@ -499,7 +494,6 @@ + { + typedef detail::fp_traits<long double>::type traits; + typedef traits::method method; +- typedef boost::is_floating_point<long double>::type fp_tag; + typedef long double value_type; + return detail::isinf_impl(static_cast<value_type>(x), method()); + } +@@ -585,7 +578,6 @@ + { //!< \brief return true if floating-point type t is NaN (Not A Number). + typedef detail::fp_traits<long double>::type traits; + typedef traits::method method; +- typedef boost::is_floating_point<long double>::type fp_tag; + return detail::isnan_impl(x, method()); + } + #endif diff --git a/external/boost/boost.multi_array.Wunused-local-typedefs.warnings.patch b/external/boost/boost.multi_array.Wunused-local-typedefs.warnings.patch new file mode 100644 index 000000000000..22645cc24b8b --- /dev/null +++ b/external/boost/boost.multi_array.Wunused-local-typedefs.warnings.patch @@ -0,0 +1,20 @@ +--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp ++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp +@@ -39,8 +39,6 @@ + + template <typename Array, typename IdxGen, typename Call_Type> + static void call(Array& a, const IdxGen& idgen, Call_Type c) { +- typedef typename Array::index_range index_range_; +- typedef typename Array::index index_; + idgen_helper<N-1>::call(a,idgen[c],c); + } + }; +@@ -50,8 +48,6 @@ + + template <typename Array, typename IdxGen, typename Call_Type> + static void call(Array& a, const IdxGen& idgen, Call_Type) { +- typedef typename Array::index_range index_range_; +- typedef typename Array::index index_; + a[ idgen ]; + } + }; diff --git a/external/boost/boost.random.Wunused-local-typedefs.warnings.patch b/external/boost/boost.random.Wunused-local-typedefs.warnings.patch new file mode 100644 index 000000000000..7d4874217e56 --- /dev/null +++ b/external/boost/boost.random.Wunused-local-typedefs.warnings.patch @@ -0,0 +1,20 @@ +--- a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:09.804149686 +0200 ++++ a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:30.020195845 +0200 +@@ -55,7 +55,6 @@ + using std::floor; + BOOST_ASSERT((g.min)() == 0); + BOOST_ASSERT((g.max)() == 1); +- typedef typename URNG::result_type base_result; + std::size_t digits = std::numeric_limits<RealType>::digits; + std::size_t engine_bits = detail::generator_bits<URNG>::value(); + std::size_t b = (std::min)(bits, digits); +--- a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:15:04.571429634 +0200 ++++ a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:14:28.452337186 +0200 +@@ -36,7 +36,6 @@ + { + for(;;) { + typedef T result_type; +- typedef typename Engine::result_type base_result; + result_type numerator = static_cast<T>(eng() - (eng.min)()); + result_type divisor = static_cast<T>((eng.max)() - (eng.min)()); + BOOST_ASSERT(divisor > 0); diff --git a/external/boost/boost.spirit.Wunused-local-typedefs.warnings.patch b/external/boost/boost.spirit.Wunused-local-typedefs.warnings.patch new file mode 100644 index 000000000000..babe844cea28 --- /dev/null +++ b/external/boost/boost.spirit.Wunused-local-typedefs.warnings.patch @@ -0,0 +1,49 @@ +--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp +@@ -307,7 +307,6 @@ + #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) + typedef impl::grammar_helper_base<GrammarT> helper_base_t; + typedef grammar_helper_list<GrammarT> helper_list_t; +- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + + helper_list_t& helpers = + # if !defined(__GNUC__) || (__GNUC__ > 2) +@@ -318,6 +317,7 @@ + + # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \ + || defined(BOOST_INTEL_CXX_VERSION) ++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) + (*i)->undefine(self); + # else +--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp +@@ -47,7 +47,6 @@ + typename parser_result<self_t, ScannerT>::type + parse(ScannerT const& scan) const + { +- typedef typename parser_result<self_t, ScannerT>::type result_t; + typedef typename ScannerT::value_t value_t; + typedef typename ScannerT::iterator_t iterator_t; + +--- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp +@@ -140,7 +140,6 @@ + parse(ScannerT const& scan) const + { + typedef typename parser_result<ParserT, ScannerT>::type result_t; +- typedef typename ScannerT::iterator_t iterator_t; + + result_t hit = this->subject().parse(scan); + if (!hit) +--- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp +@@ -49,8 +49,6 @@ + typename parser_result<self_t, ScannerT>::type + parse(ScannerT const& scan) const + { +- typedef typename parser_result<self_t, ScannerT>::type result_t; +- typedef typename ScannerT::value_t value_t; + typedef typename ScannerT::iterator_t iterator_t; + + iterator_t const s(scan.first); diff --git a/external/boost/boost.tuple.Wunused-local-typedefs.warnings.patch b/external/boost/boost.tuple.Wunused-local-typedefs.warnings.patch new file mode 100644 index 000000000000..dd05a1f83d98 --- /dev/null +++ b/external/boost/boost.tuple.Wunused-local-typedefs.warnings.patch @@ -0,0 +1,10 @@ +--- a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:31:21.682966336 +0200 ++++ a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:32:44.067231648 +0200 +@@ -225,7 +225,6 @@ + get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) { + typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE + apply<cons<HT, TT> > impl; +- typedef BOOST_DEDUCED_TYPENAME impl::type cons_element; + return impl::call(c).head; + } + diff --git a/external/boost/boost.wunused-local-typedefs.patch b/external/boost/boost.wunused-local-typedefs.patch deleted file mode 100644 index ced3195cf5cc..000000000000 --- a/external/boost/boost.wunused-local-typedefs.patch +++ /dev/null @@ -1,258 +0,0 @@ ---- a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:09.804149686 +0200 -+++ a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:30.020195845 +0200 -@@ -55,7 +55,6 @@ - using std::floor; - BOOST_ASSERT((g.min)() == 0); - BOOST_ASSERT((g.max)() == 1); -- typedef typename URNG::result_type base_result; - std::size_t digits = std::numeric_limits<RealType>::digits; - std::size_t engine_bits = detail::generator_bits<URNG>::value(); - std::size_t b = (std::min)(bits, digits); ---- a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:15:04.571429634 +0200 -+++ a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:14:28.452337186 +0200 -@@ -36,7 +36,6 @@ - { - for(;;) { - typedef T result_type; -- typedef typename Engine::result_type base_result; - result_type numerator = static_cast<T>(eng() - (eng.min)()); - result_type divisor = static_cast<T>((eng.max)() - (eng.min)()); - BOOST_ASSERT(divisor > 0); ---- a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:02:13.660436127 +0200 -+++ a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:01:17.372246240 +0200 -@@ -339,7 +338,6 @@ - { //!< \brief return true if floating-point type t is finite. - typedef detail::fp_traits<long double>::type traits; - typedef traits::method method; -- typedef boost::is_floating_point<long double>::type fp_tag; - typedef long double value_type; - return detail::isfinite_impl(static_cast<value_type>(x), method()); - } -@@ -410,7 +407,6 @@ - { - typedef detail::fp_traits<long double>::type traits; - typedef traits::method method; -- typedef boost::is_floating_point<long double>::type fp_tag; - typedef long double value_type; - return detail::isnormal_impl(static_cast<value_type>(x), method()); - } -@@ -499,7 +494,6 @@ - { - typedef detail::fp_traits<long double>::type traits; - typedef traits::method method; -- typedef boost::is_floating_point<long double>::type fp_tag; - typedef long double value_type; - return detail::isinf_impl(static_cast<value_type>(x), method()); - } -@@ -585,7 +578,6 @@ - { //!< \brief return true if floating-point type t is NaN (Not A Number). - typedef detail::fp_traits<long double>::type traits; - typedef traits::method method; -- typedef boost::is_floating_point<long double>::type fp_tag; - return detail::isnan_impl(x, method()); - } - #endif ---- a/b/boost/boost/date_time/gregorian/greg_facet.hpp 2013-05-31 14:03:30.476695310 +0200 -+++ a/b/boost/boost/date_time/gregorian/greg_facet.hpp 2013-05-31 14:03:22.894669713 +0200 -@@ -215,7 +215,6 @@ - { - std::istream_iterator<std::basic_string<charT>, charT> beg(is), eos; - -- typedef boost::date_time::all_date_names_put<greg_facet_config, charT> facet_def; - d = from_stream(beg, eos); - return is; - } ---- a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:31:21.682966336 +0200 -+++ a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:32:44.067231648 +0200 -@@ -225,7 +225,6 @@ - get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) { - typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE - apply<cons<HT, TT> > impl; -- typedef BOOST_DEDUCED_TYPENAME impl::type cons_element; - return impl::call(c).head; - } - ---- misc/boost_1_44_0/boost/bind/arg.hpp -+++ misc/build/boost_1_44_0/boost/bind/arg.hpp -@@ -35,6 +35,8 @@ - { - // static assert I == is_placeholder<T>::value - typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ]; -+ T_must_be_placeholder dummy; (void) dummy; -+ // silence -Werror=unused-local-typedefs (GCC 4.8) - } - }; - ---- misc/boost_1_44_0/boost/concept/detail/general.hpp -+++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp -@@ -68,7 +68,9 @@ - # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \ - typedef ::boost::concepts::detail::instantiate< \ - &::boost::concepts::requirement_<ModelFnPtr>::failed> \ -- BOOST_PP_CAT(boost_concept_check,__LINE__) -+ BOOST_PP_CAT(boost_concept_check,__LINE__); \ -+ void BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)(BOOST_PP_CAT(boost_concept_check,__LINE__) *) -+ // silence -Werror=unused-local-typedefs (GCC 4.8) - - }} - ---- misc/boost_1_44_0/boost/date_time/date_parsing.hpp -+++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp -@@ -113,7 +113,6 @@ - spec_str = "mdy"; - } - -- typedef typename date_type::year_type year_type; - typedef typename date_type::month_type month_type; - unsigned pos = 0; - unsigned short year(0), month(0), day(0); -@@ -159,7 +158,7 @@ - parse_undelimited_date(const std::string& s) { - int offsets[] = {4,2,2}; - int pos = 0; -- typedef typename date_type::year_type year_type; -+ //typedef typename date_type::year_type year_type; - //typename date_type::ymd_type ymd((year_type::min)(),1,1); - unsigned short y = 0, m = 0, d = 0; - ---- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp -+++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp -@@ -36,7 +36,6 @@ - boost::io::ios_flags_saver iflags(os); - typedef local_date_time time_type;//::utc_time_type typename - typedef date_time::time_facet<time_type, CharT> custom_time_facet; -- typedef std::time_put<CharT> std_time_facet; - std::ostreambuf_iterator<CharT> oitr(os); - - if(std::has_facet<custom_time_facet>(os.getloc())) { -@@ -123,7 +122,6 @@ - const boost::local_time::local_time_period& p) { - boost::io::ios_flags_saver iflags(os); - typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet; -- typedef std::time_put<CharT> std_time_facet; - std::ostreambuf_iterator<CharT> oitr(os); - if (std::has_facet<custom_facet>(os.getloc())) { - std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p); ---- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp -+++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp -@@ -47,7 +47,6 @@ - const ptime& p) { - boost::io::ios_flags_saver iflags(os); - typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -- typedef std::time_put<CharT> std_ptime_facet; - std::ostreambuf_iterator<CharT> oitr(os); - if (std::has_facet<custom_ptime_facet>(os.getloc())) - std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); -@@ -114,7 +113,6 @@ - const boost::posix_time::time_period& p) { - boost::io::ios_flags_saver iflags(os); - typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -- typedef std::time_put<CharT> std_time_facet; - std::ostreambuf_iterator<CharT> oitr(os); - if (std::has_facet<custom_ptime_facet>(os.getloc())) { - std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); -@@ -180,7 +178,6 @@ - { - boost::io::ios_flags_saver iflags(os); - typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -- typedef std::time_put<CharT> std_ptime_facet; - std::ostreambuf_iterator<CharT> oitr(os); - if (std::has_facet<custom_ptime_facet>(os.getloc())) - std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td); ---- misc/boost_1_44_0/boost/date_time/string_convert.hpp -+++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp -@@ -21,7 +21,6 @@ - inline - std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str) - { -- typedef std::basic_string<InputT> input_type; - typedef std::basic_string<OutputT> output_type; - output_type result; - result.insert(result.begin(), inp_str.begin(), inp_str.end()); ---- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp -+++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp -@@ -35,7 +35,6 @@ - { - typedef std::basic_string<charT> string_type; - typedef std::vector<string_type> collection_type; -- typedef std::basic_ostringstream<charT> ostream_type; - typedef std::ostreambuf_iterator<charT> ostream_iter_type; - typedef std::basic_ostringstream<charT> stringstream_type; - typedef std::time_put<charT> time_put_facet_type; -@@ -85,7 +84,6 @@ - { - typedef std::basic_string<charT> string_type; - typedef std::vector<string_type> collection_type; -- typedef std::basic_ostringstream<charT> ostream_type; - typedef std::ostreambuf_iterator<charT> ostream_iter_type; - typedef std::basic_ostringstream<charT> stringstream_type; - typedef std::time_put<charT> time_put_facet_type; ---- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp -+++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp -@@ -39,8 +39,6 @@ - - template <typename Array, typename IdxGen, typename Call_Type> - static void call(Array& a, const IdxGen& idgen, Call_Type c) { -- typedef typename Array::index_range index_range_; -- typedef typename Array::index index_; - idgen_helper<N-1>::call(a,idgen[c],c); - } - }; -@@ -50,8 +48,6 @@ - - template <typename Array, typename IdxGen, typename Call_Type> - static void call(Array& a, const IdxGen& idgen, Call_Type) { -- typedef typename Array::index_range index_range_; -- typedef typename Array::index index_; - a[ idgen ]; - } - }; ---- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp -+++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp -@@ -307,7 +307,6 @@ - #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) - typedef impl::grammar_helper_base<GrammarT> helper_base_t; - typedef grammar_helper_list<GrammarT> helper_list_t; -- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - - helper_list_t& helpers = - # if !defined(__GNUC__) || (__GNUC__ > 2) -@@ -318,6 +317,7 @@ - - # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \ - || defined(BOOST_INTEL_CXX_VERSION) -+ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) - (*i)->undefine(self); - # else ---- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp -+++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp -@@ -47,7 +47,6 @@ - typename parser_result<self_t, ScannerT>::type - parse(ScannerT const& scan) const - { -- typedef typename parser_result<self_t, ScannerT>::type result_t; - typedef typename ScannerT::value_t value_t; - typedef typename ScannerT::iterator_t iterator_t; - ---- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp -+++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp -@@ -140,7 +140,6 @@ - parse(ScannerT const& scan) const - { - typedef typename parser_result<ParserT, ScannerT>::type result_t; -- typedef typename ScannerT::iterator_t iterator_t; - - result_t hit = this->subject().parse(scan); - if (!hit) ---- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp -+++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp -@@ -49,8 +49,6 @@ - typename parser_result<self_t, ScannerT>::type - parse(ScannerT const& scan) const - { -- typedef typename parser_result<self_t, ScannerT>::type result_t; -- typedef typename ScannerT::value_t value_t; - typedef typename ScannerT::iterator_t iterator_t; - - iterator_t const s(scan.first); |