[Boost-commit] svn:boost r84860 - branches/release/boost/date_time

Subject: [Boost-commit] svn:boost r84860 - branches/release/boost/date_time
From: marshall_at_[hidden]
Date: 2013-06-21 11:04:13

Author: marshall
Date: 2013-06-21 11:04:12 EDT (Fri, 21 Jun 2013)
New Revision: 84860
URL: http://svn.boost.org/trac/boost/changeset/84860

Log:
Merge bug fixes to release. Fixes #6136. Fixes #5550

Properties modified: 
   branches/release/boost/date_time/format_date_parser.hpp   (contents, props changed)
   branches/release/boost/date_time/strings_from_facet.hpp   (contents, props changed)
Text files modified: 
   branches/release/boost/date_time/format_date_parser.hpp |    10 ----------                              
   branches/release/boost/date_time/strings_from_facet.hpp |     6 ++++--                                  
   2 files changed, 4 insertions(+), 12 deletions(-)

Modified: branches/release/boost/date_time/format_date_parser.hpp
==============================================================================
--- branches/release/boost/date_time/format_date_parser.hpp	Fri Jun 21 10:34:52 2013	(r84859)
+++ branches/release/boost/date_time/format_date_parser.hpp	2013-06-21 11:04:12 EDT (Fri, 21 Jun 2013)	(r84860)
@@ -470,7 +470,6 @@
     
     // skip leading whitespace
     while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
-    charT current_char = *sitr;
 
     short month(0);
     
@@ -485,7 +484,6 @@
               mr = m_month_short_names.match(sitr, stream_end);
               month = mr.current_match;
               if (mr.has_remaining()) {
-                current_char = mr.last_char();
                 use_current_char = true;
               }
               break;
@@ -495,7 +493,6 @@
               mr = m_month_long_names.match(sitr, stream_end);
               month = mr.current_match;
               if (mr.has_remaining()) {
-                current_char = mr.last_char();
                 use_current_char = true;
               }
               break;
@@ -523,7 +520,6 @@
         itr++;
         if (use_current_char) {
           use_current_char = false;
-          current_char = *sitr;
         }
         else {
           sitr++;
@@ -575,7 +571,6 @@
     
     // skip leading whitespace
     while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
-    charT current_char = *sitr;
 
     short wkday(0);
     
@@ -594,7 +589,6 @@
               mr = m_weekday_short_names.match(sitr, stream_end);
               wkday = mr.current_match;
               if (mr.has_remaining()) {
-                current_char = mr.last_char();
                 use_current_char = true;
               }
               break;
@@ -608,7 +602,6 @@
               mr = m_weekday_long_names.match(sitr, stream_end);
               wkday = mr.current_match;
               if (mr.has_remaining()) {
-                current_char = mr.last_char();
                 use_current_char = true;
               }
               break;
@@ -635,7 +628,6 @@
         itr++;
         if (use_current_char) {
           use_current_char = false;
-          current_char = *sitr;
         }
         else {
           sitr++;
@@ -668,7 +660,6 @@
     
     // skip leading whitespace
     while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
-    charT current_char = *sitr;
 
     unsigned short year(0);
     
@@ -708,7 +699,6 @@
         itr++;
         if (use_current_char) {
           use_current_char = false;
-          current_char = *sitr;
         }
         else {
           sitr++;

Modified: branches/release/boost/date_time/strings_from_facet.hpp
==============================================================================
--- branches/release/boost/date_time/strings_from_facet.hpp	Fri Jun 21 10:34:52 2013	(r84859)
+++ branches/release/boost/date_time/strings_from_facet.hpp	2013-06-21 11:04:12 EDT (Fri, 21 Jun 2013)	(r84860)
@@ -50,7 +50,8 @@
     //grab the needed strings by using the locale to
     //output each month
     const charT* p_outfmt = outfmt.c_str(), *p_outfmt_end = p_outfmt + outfmt.size();
-    tm tm_value = {};
+    tm tm_value;
+    memset(&tm_value, 0, sizeof(tm_value));
     for (int m=0; m < 12; m++) {
       tm_value.tm_mon = m;
       stringstream_type ss;
@@ -103,7 +104,8 @@
     //grab the needed strings by using the locale to
     //output each month / weekday
     const charT* p_outfmt = outfmt.c_str(), *p_outfmt_end = p_outfmt + outfmt.size();
-    tm tm_value = {};
+    tm tm_value;
+    memset(&tm_value, 0, sizeof(tm_value));
     for (int i=0; i < 7; i++) {
       tm_value.tm_wday = i;
       stringstream_type ss;