Merge pull request #186 from ennerf/win32-msvc-fix

MSVC protoc compiler fix
changes/73/215573/1
Feng Xiao 10 years ago
commit a22bc812a4
  1. 4
      src/google/protobuf/compiler/ruby/ruby_generator.cc
  2. 8
      vsprojects/libprotoc.vcproj

@ -47,7 +47,7 @@ namespace compiler {
namespace ruby { namespace ruby {
// Forward decls. // Forward decls.
std::string IntToString(uint32_t value); std::string IntToString(uint32 value);
std::string StripDotProto(const std::string& proto_file); std::string StripDotProto(const std::string& proto_file);
std::string LabelForField(google::protobuf::FieldDescriptor* field); std::string LabelForField(google::protobuf::FieldDescriptor* field);
std::string TypeName(google::protobuf::FieldDescriptor* field); std::string TypeName(google::protobuf::FieldDescriptor* field);
@ -64,7 +64,7 @@ void GenerateEnumAssignment(
const google::protobuf::EnumDescriptor* en, const google::protobuf::EnumDescriptor* en,
google::protobuf::io::Printer* printer); google::protobuf::io::Printer* printer);
std::string IntToString(uint32_t value) { std::string IntToString(uint32 value) {
std::ostringstream os; std::ostringstream os;
os << value; os << value;
return os.str(); return os.str();

@ -223,6 +223,10 @@
RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.h" RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.h"
> >
</File> </File>
<File
RelativePath="..\src\google\protobuf\compiler\ruby\ruby_generator.h"
>
</File>
<File <File
RelativePath="..\src\google\protobuf\compiler\java\java_context.h" RelativePath="..\src\google\protobuf\compiler\java\java_context.h"
> >
@ -375,6 +379,10 @@
RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.cc" RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.cc"
> >
</File> </File>
<File
RelativePath="..\src\google\protobuf\compiler\ruby\ruby_generator.cc"
>
</File>
<File <File
RelativePath="..\src\google\protobuf\compiler\java\java_context.cc" RelativePath="..\src\google\protobuf\compiler\java\java_context.cc"
> >

Loading…
Cancel
Save