diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-10-11 14:44:03 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-10-11 14:44:03 -0700 |
| commit | de15e73d5862e8ac618bc7be90594adacbaa1ec6 (patch) | |
| tree | 9d1f71f76902010963e0dc28db266de22b82646d /src/google/protobuf/stubs | |
| parent | c4083bb3d1231f8a94f2f000434e38528bdff64a (diff) | |
| parent | bd798dfc81443cb95ff3b6e0b787c92031b113e5 (diff) | |
Merge remote-tracking branch 'origin/3.4.x' into master
Diffstat (limited to 'src/google/protobuf/stubs')
| -rw-r--r-- | src/google/protobuf/stubs/io_win32.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/io_win32.cc b/src/google/protobuf/stubs/io_win32.cc index 51656a78..7e1cf785 100644 --- a/src/google/protobuf/stubs/io_win32.cc +++ b/src/google/protobuf/stubs/io_win32.cc @@ -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])) { |