diff -Naur boost/include/boost-1_48/boost/date_time/format_date_parser.hpp boost.patched/include/boost-1_48/boost/date_time/format_date_parser.hpp
old
|
new
|
|
60 | 60 | else { |
61 | 61 | mr.cache += (*itr); |
62 | 62 | } |
63 | | itr++; |
64 | | j++; |
| 63 | ++itr; |
| 64 | ++j; |
65 | 65 | } |
66 | 66 | int_type i = -1; |
67 | 67 | // mr.cache will hold leading zeros. size() tells us when input is too short. |
… |
… |
|
711 | 711 | itr++; //advance past format specifier |
712 | 712 | } |
713 | 713 | else { //skip past chars in format and in buffer |
714 | | itr++; |
| 714 | ++itr; |
715 | 715 | if (use_current_char) { |
716 | 716 | use_current_char = false; |
717 | 717 | current_char = *sitr; |
718 | 718 | } |
719 | 719 | else { |
720 | | sitr++; |
| 720 | ++sitr; |
721 | 721 | } |
722 | 722 | } |
723 | 723 | } |
diff -Naur boost/include/boost-1_48/boost/date_time/time_facet.hpp boost.patched/include/boost-1_48/boost/date_time/time_facet.hpp
old
|
new
|
|
1212 | 1212 | |
1213 | 1213 | } |
1214 | 1214 | else { //skip past chars in format and in buffer |
1215 | | ++itr; |
1216 | | // set use_current_char when sitr is already |
1217 | | // pointing at the next character to process |
1218 | | if (use_current_char) { |
1219 | | use_current_char = false; |
1220 | | } |
1221 | | else { |
1222 | | ++sitr; |
1223 | | } |
| 1215 | if( sitr != stream_end && *itr != *sitr ) { |
| 1216 | throw std::exception(); // mismatch in constant non format characters found |
| 1217 | } |
| 1218 | |
| 1219 | ++itr; |
| 1220 | // set use_current_char when sitr is already |
| 1221 | // pointing at the next character to process |
| 1222 | if (use_current_char) { |
| 1223 | use_current_char = false; |
| 1224 | } |
| 1225 | else { |
| 1226 | ++sitr; |
| 1227 | } |
1224 | 1228 | } |
1225 | 1229 | } |
1226 | 1230 | |