Ticket #2303: date_time.patch

boost/date_time/posix_time/posix_time_config.hpp

@@ -82 +82 @@
     //Give duration access to ticks constructor -- hide from users
     friend class date_time::time_duration<time_duration, time_res_traits>;
   private:
-    explicit time_duration(impl_type ticks) :
-      date_time::time_duration<time_duration, time_res_traits>(ticks)
+    explicit time_duration(impl_type _ticks) :
+                date_time::time_duration<time_duration, time_res_traits>(_ticks)
     {}
   };
 

boost/date_time/posix_time/posix_time_io.hpp

@@ -55 +55 @@
       //since we would always need to reconstruct for every time period
       //if the locale did not already exist.  Of course this will be overridden
       //if the user imbues as some later point.
-      std::ostreambuf_iterator<CharT> oitr(os);
+      std::ostreambuf_iterator<CharT> oitr_(os);
       custom_ptime_facet* f = new custom_ptime_facet();
       std::locale l = std::locale(os.getloc(), f);
       os.imbue(l);
-      f->put(oitr, os, os.fill(), p);
+      f->put(oitr_, os, os.fill(), p);
     }
     return os;
   }
@@ -126 +126 @@
       //since we would always need to reconstruct for every time period
       //if the local did not already exist.  Of course this will be overridden
       //if the user imbues as some later point.
-      std::ostreambuf_iterator<CharT> oitr(os);
+      std::ostreambuf_iterator<CharT> oitr_(os);
       custom_ptime_facet* f = new custom_ptime_facet();
       std::locale l = std::locale(os.getloc(), f);
       os.imbue(l);
-      f->put(oitr, os, os.fill(), p);
+      f->put(oitr_, os, os.fill(), p);
     }
     return os;
   }
@@ -194 +194 @@
       //since we would always need to reconstruct for every time period
       //if the locale did not already exist.  Of course this will be overridden
       //if the user imbues as some later point.
-      std::ostreambuf_iterator<CharT> oitr(os);
+      std::ostreambuf_iterator<CharT> oitr_(os);
       custom_ptime_facet* f = new custom_ptime_facet();
       std::locale l = std::locale(os.getloc(), f);
       os.imbue(l);
-      f->put(oitr, os, os.fill(), td);
+      f->put(oitr_, os, os.fill(), td);
     }
     return os;
   }

boost/date_time/period_parser.hpp

@@ -50 +50 @@
     enum period_range_option { AS_OPEN_RANGE, AS_CLOSED_RANGE };
 
     //! Constructor that sets up period parser options
-    period_parser(period_range_option range_option = AS_CLOSED_RANGE, 
+    period_parser(period_range_option range_option_ = AS_CLOSED_RANGE, 
                   const char_type* const period_separator = default_period_separator, 
                   const char_type* const period_start_delimeter = default_period_start_delimeter,
                   const char_type* const period_open_range_end_delimeter = default_period_open_range_end_delimeter,
                   const char_type* const period_closed_range_end_delimeter = default_period_closed_range_end_delimeter)
-      : m_range_option(range_option)
+      : m_range_option(range_option_)
     {
       delimiters.push_back(string_type(period_separator));
       delimiters.push_back(string_type(period_start_delimeter));

boost/date_time/date_generator_formatter.hpp

@@ -75 +75 @@
       }
 
       //! Constructor that allows for a custom set of phrase elements
-      date_generator_formatter(const string_type& first,
-                               const string_type& second,
-                               const string_type& third,
-                               const string_type& fourth,
-                               const string_type& fifth,
-                               const string_type& last,
-                               const string_type& before,
-                               const string_type& after,
-                               const string_type& of)
+      date_generator_formatter(const string_type& first_,
+                               const string_type& second_,
+                               const string_type& third_,
+                               const string_type& fourth_,
+                               const string_type& fifth_,
+                               const string_type& last_,
+                               const string_type& before_,
+                               const string_type& after_,
+                               const string_type& of_)
       {
         phrase_strings.push_back(string_type(first_string));
         phrase_strings.push_back(string_type(second_string));