boost/boost_1_44_0-gcc4.8.patch

   1 --- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
   2 +++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
   3 @@ -142,7 +142,6 @@
   4                      ForwardIteratorT End,
   5                      std::forward_iterator_tag ) const
   6                  {
   7 -                    typedef ForwardIteratorT input_iterator_type;
   8                      typedef iterator_range<ForwardIteratorT> result_type;
   9
  10                      first_finder_type first_finder(
  11 @@ -263,7 +262,6 @@
  12                      ForwardIteratorT End,
  13                      unsigned int N) const
  14                  {
  15 -                    typedef ForwardIteratorT input_iterator_type;
  16                      typedef iterator_range<ForwardIteratorT> result_type;
  17
  18                      // Sanity check
  19 @@ -298,7 +296,6 @@
  20                      ForwardIteratorT End,
  21                      unsigned int N) const
  22                  {
  23 -                    typedef ForwardIteratorT input_iterator_type;
  24                      typedef iterator_range<ForwardIteratorT> result_type;
  25
  26                      // Sanity check
  27 @@ -362,7 +359,6 @@
  28                  unsigned int N,
  29                  std::random_access_iterator_tag )
  30              {
  31 -                typedef ForwardIteratorT input_iterator_type;
  32                  typedef iterator_range<ForwardIteratorT> result_type;
  33
  34                  if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
  35 @@ -436,7 +432,6 @@
  36                  unsigned int N,
  37                  std::random_access_iterator_tag )
  38              {
  39 -                typedef ForwardIteratorT input_iterator_type;
  40                  typedef iterator_range<ForwardIteratorT> result_type;
  41
  42                  if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
  43 --- misc/boost_1_44_0/boost/bind/arg.hpp
  44 +++ misc/build/boost_1_44_0/boost/bind/arg.hpp
  45 @@ -35,6 +35,8 @@
  46      {
  47          // static assert I == is_placeholder<T>::value
  48          typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
  49 +        T_must_be_placeholder dummy; (void) dummy;
  50 +            // silence -Werror=unused-local-typedefs (GCC 4.8)
  51      }
  52  };
  53
  54 --- misc/boost_1_44_0/boost/concept/detail/general.hpp
  55 +++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp
  56 @@ -68,7 +68,9 @@
  57  #  define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr )             \
  58      typedef ::boost::concepts::detail::instantiate<          \
  59      &::boost::concepts::requirement_<ModelFnPtr>::failed>    \
  60 -      BOOST_PP_CAT(boost_concept_check,__LINE__)
  61 +      BOOST_PP_CAT(boost_concept_check,__LINE__); \
  62 +    BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)(...)
  63 +        // silence -Werror=unused-local-typedefs (GCC 4.8) (and resulting Clang -Werror,-Wvexing-parse)
  64
  65  }}
  66
  67 --- misc/boost_1_44_0/boost/date_time/date_parsing.hpp
  68 +++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp
  69 @@ -113,7 +113,6 @@
  70          spec_str = "mdy";
  71        }
  72
  73 -      typedef typename date_type::year_type year_type;
  74        typedef typename date_type::month_type month_type;
  75        unsigned pos = 0;
  76        unsigned short year(0), month(0), day(0);
  77 @@ -159,7 +158,7 @@
  78      parse_undelimited_date(const std::string& s) {
  79        int offsets[] = {4,2,2};
  80        int pos = 0;
  81 -      typedef typename date_type::year_type year_type;
  82 +      //typedef typename date_type::year_type year_type;
  83        //typename date_type::ymd_type ymd((year_type::min)(),1,1);
  84        unsigned short y = 0, m = 0, d = 0;
  85
  86 --- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
  87 +++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
  88 @@ -36,7 +36,6 @@
  89      boost::io::ios_flags_saver iflags(os);
  90      typedef local_date_time time_type;//::utc_time_type typename
  91      typedef date_time::time_facet<time_type, CharT> custom_time_facet;
  92 -    typedef std::time_put<CharT> std_time_facet;
  93      std::ostreambuf_iterator<CharT> oitr(os);
  94
  95      if(std::has_facet<custom_time_facet>(os.getloc())) {
  96 @@ -123,7 +122,6 @@
  97               const boost::local_time::local_time_period& p) {
  98      boost::io::ios_flags_saver iflags(os);
  99      typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet;
 100 -    typedef std::time_put<CharT> std_time_facet;
 101      std::ostreambuf_iterator<CharT> oitr(os);
 102      if (std::has_facet<custom_facet>(os.getloc())) {
 103        std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p);
 104 --- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
 105 +++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
 106 @@ -47,7 +47,6 @@
 107               const ptime& p) {
 108      boost::io::ios_flags_saver iflags(os);
 109      typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
 110 -    typedef std::time_put<CharT>                  std_ptime_facet;
 111      std::ostreambuf_iterator<CharT> oitr(os);
 112      if (std::has_facet<custom_ptime_facet>(os.getloc()))
 113        std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
 114 @@ -114,7 +113,6 @@
 115               const boost::posix_time::time_period& p) {
 116      boost::io::ios_flags_saver iflags(os);
 117      typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
 118 -    typedef std::time_put<CharT>                  std_time_facet;
 119      std::ostreambuf_iterator<CharT> oitr(os);
 120      if (std::has_facet<custom_ptime_facet>(os.getloc())) {
 121        std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
 122 @@ -180,7 +178,6 @@
 123    {
 124      boost::io::ios_flags_saver iflags(os);
 125      typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
 126 -    typedef std::time_put<CharT>                  std_ptime_facet;
 127      std::ostreambuf_iterator<CharT> oitr(os);
 128      if (std::has_facet<custom_ptime_facet>(os.getloc()))
 129        std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td);
 130 --- misc/boost_1_44_0/boost/date_time/string_convert.hpp
 131 +++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp
 132 @@ -21,7 +21,6 @@
 133    inline
 134    std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str)
 135    {
 136 -    typedef std::basic_string<InputT> input_type;
 137      typedef std::basic_string<OutputT> output_type;
 138      output_type result;
 139      result.insert(result.begin(), inp_str.begin(), inp_str.end());
 140 --- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp
 141 +++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp
 142 @@ -35,7 +35,6 @@
 143  {
 144    typedef std::basic_string<charT> string_type;
 145    typedef std::vector<string_type> collection_type;
 146 -  typedef std::basic_ostringstream<charT> ostream_type;
 147    typedef std::ostreambuf_iterator<charT> ostream_iter_type;
 148    typedef std::basic_ostringstream<charT> stringstream_type;
 149    typedef std::time_put<charT>           time_put_facet_type;
 150 @@ -85,7 +84,6 @@
 151  {
 152    typedef std::basic_string<charT> string_type;
 153    typedef std::vector<string_type> collection_type;
 154 -  typedef std::basic_ostringstream<charT> ostream_type;
 155    typedef std::ostreambuf_iterator<charT> ostream_iter_type;
 156    typedef std::basic_ostringstream<charT> stringstream_type;
 157    typedef std::time_put<charT>           time_put_facet_type;
 158 --- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
 159 +++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
 160 @@ -39,8 +39,6 @@
 161
 162      template <typename Array, typename IdxGen, typename Call_Type>
 163      static void call(Array& a, const IdxGen& idgen, Call_Type c) {
 164 -      typedef typename Array::index_range index_range_;
 165 -      typedef typename Array::index index_;
 166        idgen_helper<N-1>::call(a,idgen[c],c);
 167      }
 168    };
 169 @@ -50,8 +48,6 @@
 170
 171      template <typename Array, typename IdxGen, typename Call_Type>
 172      static void call(Array& a, const IdxGen& idgen, Call_Type) {
 173 -      typedef typename Array::index_range index_range_;
 174 -      typedef typename Array::index index_;
 175        a[ idgen ];
 176      }
 177    };
 178 --- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
 179 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
 180 @@ -307,7 +307,6 @@
 181  #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
 182          typedef impl::grammar_helper_base<GrammarT> helper_base_t;
 183          typedef grammar_helper_list<GrammarT> helper_list_t;
 184 -        typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
 185
 186          helper_list_t&  helpers =
 187  # if !defined(__GNUC__) || (__GNUC__ > 2)
 188 @@ -318,6 +317,7 @@
 189
 190  # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \
 191      || defined(BOOST_INTEL_CXX_VERSION)
 192 +        typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
 193          for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
 194              (*i)->undefine(self);
 195  # else
 196 --- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
 197 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
 198 @@ -47,7 +47,6 @@
 199          typename parser_result<self_t, ScannerT>::type
 200          parse(ScannerT const& scan) const
 201          {
 202 -            typedef typename parser_result<self_t, ScannerT>::type result_t;
 203              typedef typename ScannerT::value_t value_t;
 204              typedef typename ScannerT::iterator_t iterator_t;
 205
 206 --- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
 207 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
 208 @@ -140,7 +140,6 @@
 209          parse(ScannerT const& scan) const
 210          {
 211              typedef typename parser_result<ParserT, ScannerT>::type result_t;
 212 -            typedef typename ScannerT::iterator_t iterator_t;
 213
 214              result_t hit = this->subject().parse(scan);
 215              if (!hit)
 216 --- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
 217 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
 218 @@ -49,8 +49,6 @@
 219          typename parser_result<self_t, ScannerT>::type
 220          parse(ScannerT const& scan) const
 221          {
 222 -            typedef typename parser_result<self_t, ScannerT>::type result_t;
 223 -            typedef typename ScannerT::value_t      value_t;
 224              typedef typename ScannerT::iterator_t   iterator_t;
 225
 226              iterator_t const s(scan.first);