diff options
| author |  liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-12-03 09:12:33 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-12-03 09:12:33 +0000 |
| commit | 2726e7a6ebd72eec6f66abe4ced3c88983f20b8e (patch) | |
| tree | dcf88bc5537ca5b35b1bee3af5c04505b7a90c94 /src/google/protobuf/compiler/command_line_interface.cc | |
| parent | 0acafda8f424bb8a5adcf77bf2d4bdb3a9661d4b (diff) | |
Fix issues: 166 167 172 175 181 188 192 194 195.
Diffstat (limited to 'src/google/protobuf/compiler/command_line_interface.cc')
| -rw-r--r-- | src/google/protobuf/compiler/command_line_interface.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc index 9e9849cf..1c76994b 100644 --- a/src/google/protobuf/compiler/command_line_interface.cc +++ b/src/google/protobuf/compiler/command_line_interface.cc @@ -781,7 +781,7 @@ bool CommandLineInterface::ParseArguments(int argc, const char* const argv[]) { // If no --proto_path was given, use the current working directory. if (proto_path_.empty()) { - proto_path_.push_back(make_pair("", ".")); + proto_path_.push_back(make_pair<string, string>("", ".")); } // Check some errror cases. @@ -910,7 +910,7 @@ bool CommandLineInterface::InterpretArgument(const string& name, cerr << disk_path << ": warning: directory does not exist." << endl; } - proto_path_.push_back(make_pair(virtual_path, disk_path)); + proto_path_.push_back(make_pair<string, string>(virtual_path, disk_path)); } } else if (name == "-o" || name == "--descriptor_set_out") { |