diff options
author | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:23:41 -0800 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:23:41 -0800 |
commit | cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9 (patch) | |
tree | e7e5dd284e2384dfaf1f8eff0eb2f3feab944872 /src/google/protobuf/compiler/ruby/ruby_generator.cc | |
parent | f473bb9903370cc9324b0881873e0d0861f5d325 (diff) | |
download | protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.gz protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.bz2 protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.zip |
Integrate changes from Google open-source branch.
Diffstat (limited to 'src/google/protobuf/compiler/ruby/ruby_generator.cc')
-rw-r--r-- | src/google/protobuf/compiler/ruby/ruby_generator.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/ruby/ruby_generator.cc b/src/google/protobuf/compiler/ruby/ruby_generator.cc index 82ccd72b..6fed1d46 100644 --- a/src/google/protobuf/compiler/ruby/ruby_generator.cc +++ b/src/google/protobuf/compiler/ruby/ruby_generator.cc @@ -47,7 +47,7 @@ namespace compiler { namespace ruby { // Forward decls. -std::string IntToString(uint32_t value); +std::string IntToString(uint32 value); std::string StripDotProto(const std::string& proto_file); std::string LabelForField(google::protobuf::FieldDescriptor* field); std::string TypeName(google::protobuf::FieldDescriptor* field); @@ -64,7 +64,7 @@ void GenerateEnumAssignment( const google::protobuf::EnumDescriptor* en, google::protobuf::io::Printer* printer); -std::string IntToString(uint32_t value) { +std::string IntToString(uint32 value) { std::ostringstream os; os << value; return os.str(); @@ -299,7 +299,8 @@ bool Generator::Generate( string* error) const { std::string filename = StripDotProto(file->name()) + ".rb"; - scoped_ptr<io::ZeroCopyOutputStream> output(generator_context->Open(filename)); + scoped_ptr<io::ZeroCopyOutputStream> output( + generator_context->Open(filename)); io::Printer printer(output.get(), '$'); GenerateFile(file, &printer); |