Skip to content

Commit

Permalink
Merge pull request #3690 from pherl/3.4.x
Browse files Browse the repository at this point in the history
Remove ranged based for in io_win32.cc
  • Loading branch information
liujisi authored Oct 2, 2017
2 parents a38f876 + 6d0cf1b commit bd798df
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/google/protobuf/stubs/io_win32.cc
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,12 @@ string normalize(string path) {
// Join all segments.
bool first = true;
std::ostringstream result;
for (const auto& s : segments) {
for (int i = 0; i < segments.size(); ++i) {
if (!first) {
result << '\\';
}
first = false;
result << s;
result << segments[i];
}
// Preserve trailing separator if the input contained it.
if (!path.empty() && is_separator(path[path.size() - 1])) {
Expand Down

0 comments on commit bd798df

Please sign in to comment.