diff --git a/protoc/CppFileGenerator.cpp b/protoc/CppFileGenerator.cpp index ee93afc144..a0eb51d0ce 100644 --- a/protoc/CppFileGenerator.cpp +++ b/protoc/CppFileGenerator.cpp @@ -196,8 +196,8 @@ void FileGenerator::GenerateBuildDescriptors(Printer* printer) { "assigndescriptorsname", GlobalAssignDescriptorsName(m_output_name)); printer->Indent(); - // No longer needed since protobuf 3.7 -#if GOOGLE_PROTOBUF_VERSION < 3007000 + // No longer needed since protobuf 3.2 +#if GOOGLE_PROTOBUF_VERSION < 3002000 // Make sure the file has found its way into the pool. If a descriptor // is requested *during* static init then AddDescriptors() may not have // been called yet, so we call it manually. Note that it's fine if diff --git a/protoc/GeneratorHelpers.cpp b/protoc/GeneratorHelpers.cpp index d0939c4309..28f8bd40cf 100644 --- a/protoc/GeneratorHelpers.cpp +++ b/protoc/GeneratorHelpers.cpp @@ -104,8 +104,8 @@ string FilenameIdentifier(const string& filename) { return result; } -// No longer needed since protobuf 3.7 -#if GOOGLE_PROTOBUF_VERSION < 3007000 +// No longer needed since protobuf 3.2 +#if GOOGLE_PROTOBUF_VERSION < 3002000 // Return the name of the AddDescriptors() function for a given file. string GlobalAddDescriptorsName(const string& filename) { return "protobuf_AddDesc_" + FilenameIdentifier(filename); diff --git a/protoc/GeneratorHelpers.h b/protoc/GeneratorHelpers.h index 2e9d311d0e..9bcbf626ff 100644 --- a/protoc/GeneratorHelpers.h +++ b/protoc/GeneratorHelpers.h @@ -67,8 +67,8 @@ string StripProto(const string& filename); // Convert a file name into a valid identifier. string FilenameIdentifier(const string& filename); -// No longer needed since protobuf 3.7 -#if GOOGLE_PROTOBUF_VERSION < 3007000 +// No longer needed since protobuf 3.2 +#if GOOGLE_PROTOBUF_VERSION < 3002000 // Return the name of the AddDescriptors() function for a given file. string GlobalAddDescriptorsName(const string& filename); #endif