Better fix for building protobufs with C++0x turned on.

2012-01-20 16:21:50 -08:00 · 2012-01-20 16:21:50 -08:00 · df08914549
parent f02f4510dd
commit df08914549
2 changed files with 34 additions and 34 deletions
--- a/library/depends/protobuf/google/protobuf/compiler/command_line_interface.cc
+++ b/library/depends/protobuf/google/protobuf/compiler/command_line_interface.cc
@ -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<string, string>(virtual_path.c_str(), disk_path.c_str()));
+      proto_path_.push_back(pair<string, string>(virtual_path, disk_path));
    }

  } else if (name == "-o" || name == "--descriptor_set_out") {