organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixed bugs

Browse source
This commit is contained in:
Krishna 2014-12-10 21:02:12 +01:00
parent a761f061f4
commit 7654f78029
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/google/protobuf/compiler/cpp/cpp_helpers.cc
View file

@ -360,6 +360,12 @@ string FilenameIdentifier(const string& filename) {
return result;
}
string GlobalSymbolName(const string& filename, string prefix)
{
return prefix + FilenameIdentifier(filename);
}
// Return the name of the AddDescriptors() function for a given file.
string GlobalAddDescriptorsName(const string& filename)
{
@ -378,10 +384,6 @@ string GlobalShutdownFileName(const string& filename)
return GlobalSymbolName(filename,"protobuf_ShutdownFile_");
}
string GlobalSymbolName(const string& filename, string prefix)
{
return prefix + FilenameIdentifier(filename);
}
// Return the qualified C++ name for a file level symbol.
string QualifiedFileLevelSymbol(const string& package, const string& name) {

2
src/google/protobuf/compiler/python/python_generator.cc
View file

@ -581,7 +581,7 @@ void Generator::PrintServiceDescriptor(
}
void Generator::PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor, string keyandmodule) {
void Generator::PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor, const char* keyandmodule) const {
printer_->Print(keyandmodule,"class_name", descriptor.name());
printer_->Indent();
printer_->Print(

1
src/google/protobuf/compiler/python/python_generator.h
View file

@ -127,6 +127,7 @@ class LIBPROTOC_EXPORT Generator : public CodeGenerator {
void PrintServiceDescriptor(const ServiceDescriptor& descriptor) const;
void PrintServiceClass(const ServiceDescriptor& descriptor) const;
void PrintServiceStub(const ServiceDescriptor& descriptor) const;
void PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor, const char* keyandmodule) const ;
void PrintEnumValueDescriptor(const EnumValueDescriptor& descriptor) const;
string OptionsValue(const string& class_name,