Updates for Protobuf 30+ C++ API changes

Author: cho-m

protoc/CppFileGenerator.cpp

@@ -59,7 +59,7 @@ FileGenerator::FileGenerator(const FileDescriptor *file,
                              const string &output_name)
     : m_file(file),
       m_output_name(output_name) {
-  SplitStringUsing(file->package(), ".", &package_parts_);
+  SplitStringUsing(string(file->package()), ".", &package_parts_);
 
   ServiceGenerator::Options options;
   for (int i = 0; i < file->service_count(); i++) {
@@ -79,7 +79,7 @@ void FileGenerator::GenerateHeader(Printer *printer) {
   const string filename_identifier = FilenameIdentifier(m_output_name);
 
   std::map<string, string> var_map;
-  var_map["basename"] = StripProto(m_file->name());
+  var_map["basename"] = StripProto(string(m_file->name()));
   var_map["filename"] = m_file->name();
   var_map["filename_identifier"] = filename_identifier;
 

protoc/CppGenerator.cpp

@@ -43,7 +43,7 @@ bool CppGenerator::Generate(const FileDescriptor *file,
                             const string&,
                             OutputDirectory *generator_context,
                             string*) const {
-  string basename = StripProto(file->name()) + "Service";
+  string basename = StripProto(string(file->name())) + "Service";
 
   string header_name = basename + ".pb.h";
   string code_name = basename + ".pb.cpp";

protoc/GeneratorHelpers.cpp

@@ -69,13 +69,13 @@ string ClassName(const Descriptor* descriptor, bool qualified) {
   const Descriptor* outer = descriptor;
   while (outer->containing_type() != NULL) outer = outer->containing_type();
 
-  const string& outer_name = outer->full_name();
-  string inner_name = descriptor->full_name().substr(outer_name.size());
+  const string& outer_name = string(outer->full_name());
+  string inner_name = string(descriptor->full_name()).substr(outer_name.size());
 
   if (qualified) {
     return "::" + DotsToColons(outer_name) + DotsToUnderscores(inner_name);
   } else {
-    return outer->name() + DotsToUnderscores(inner_name);
+    return string(outer->name()) + DotsToUnderscores(inner_name);
   }
 }
 

protoc/ServiceGenerator.cpp

@@ -327,11 +327,16 @@ void ServiceGenerator::GenerateCallMethod(Printer* printer) {
       "              const $input_type$*>(request),\n"
       "          ::google::protobuf::down_cast<\n"
       "              $output_type$*>(response),\n"
-#else
+#elif GOOGLE_PROTOBUF_VERSION < 6030000
       "          ::google::protobuf::internal::DownCast<\n"
       "              const $input_type$*>(request),\n"
       "          ::google::protobuf::internal::DownCast<\n"
       "              $output_type$*>(response),\n"
+#else
+      "          ::google::protobuf::DownCastMessage<\n"
+      "              $input_type$>(request),\n"
+      "          ::google::protobuf::DownCastMessage<\n"
+      "              $output_type$>(response),\n"
 #endif
       "          done);\n"
       "      break;\n");