Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/importer.h

Issue 21208003: Update protobuf to r428, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_unittest.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_doc_comment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/src/google/protobuf/compiler/importer.h
===================================================================
--- third_party/protobuf/src/google/protobuf/compiler/importer.h (revision 216642)
+++ third_party/protobuf/src/google/protobuf/compiler/importer.h (working copy)
@@ -280,8 +280,9 @@
string virtual_path;
string disk_path;
- inline Mapping(const string& virtual_path, const string& disk_path)
- : virtual_path(virtual_path), disk_path(disk_path) {}
+ inline Mapping(const string& virtual_path_param,
+ const string& disk_path_param)
+ : virtual_path(virtual_path_param), disk_path(disk_path_param) {}
};
vector<Mapping> mappings_;
« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_unittest.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_doc_comment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698