commit 406a40cf16b597974c739b7175ce3f3977d59cd3
author Mark Slee <mcslee@apache.org> Tue Jan 16 22:48:22 2007 +0000
committer Mark Slee <mcslee@apache.org> Tue Jan 16 22:48:22 2007 +0000
tree 04a76d20e27003972193bc3368a951be2afda828
parent d95abdd9183be7e0d895d19818dad8d8ad263e52

Prefix generated _args and _result helper classes with service name

Summary: To avoid conflicts when you have two services with the same name inside one .thrift file

Reviewed By: aditya


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664915 13f79535-47bb-0310-9956-ffa450edef68

compiler/cpp/src/generate/t_cpp_generator.cc

diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index efe327b..44b339d 100644
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -727,10 +727,11 @@
   vector<t_function*>::iterator f_iter; 
   for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
     t_struct* ts = (*f_iter)->get_arglist();
+    ts->set_name(tservice->get_name() + "_" + (*f_iter)->get_name() + "_args");
     generate_struct_definition(f_service_, ts);
     generate_struct_reader(f_service_, ts);
     generate_struct_writer(f_service_, ts);
-    generate_function_helpers(*f_iter);
+    generate_function_helpers(tservice, *f_iter);
   }
 }
 
@@ -1065,8 +1066,8 @@
     scope_up(f_service_);
 
     // Function arguments and results
-    string argsname = (*f_iter)->get_name() + "_args";
-    string resultname = (*f_iter)->get_name() + "_result";
+    string argsname = tservice->get_name() + "_" + (*f_iter)->get_name() + "_args";
+    string resultname = tservice->get_name() + "_" + (*f_iter)->get_name() + "_result";
 
     // Serialize the request
     f_service_ <<
@@ -1310,12 +1311,13 @@
  *
  * @param tfunction The function
  */
-void t_cpp_generator::generate_function_helpers(t_function* tfunction) {
+void t_cpp_generator::generate_function_helpers(t_service* tservice,
+                                                t_function* tfunction) {
   if (tfunction->is_async()) {
     return;
   }
 
-  t_struct result(program_, tfunction->get_name() + "_result");
+  t_struct result(program_, tservice->get_name() + "_" + tfunction->get_name() + "_result");
   t_field success(tfunction->get_returntype(), "success", 0);
   if (!tfunction->get_returntype()->is_void()) {
     result.append(&success);
@@ -1347,8 +1349,8 @@
     "(int32_t seqid, boost::shared_ptr<facebook::thrift::protocol::TProtocol> iprot, boost::shared_ptr<facebook::thrift::protocol::TProtocol> oprot)" << endl;
   scope_up(f_service_);
 
-  string argsname = tfunction->get_name() + "_args";
-  string resultname = tfunction->get_name() + "_result";
+  string argsname = tservice->get_name() + "_" + tfunction->get_name() + "_args";
+  string resultname = tservice->get_name() + "_" + tfunction->get_name() + "_result";
 
   f_service_ <<
     indent() << argsname << " args;" << endl <<

compiler/cpp/src/generate/t_cpp_generator.h

diff --git a/compiler/cpp/src/generate/t_cpp_generator.h b/compiler/cpp/src/generate/t_cpp_generator.h
index 886279d..260c8d6 100644
--- a/compiler/cpp/src/generate/t_cpp_generator.h
+++ b/compiler/cpp/src/generate/t_cpp_generator.h
@@ -66,7 +66,7 @@
   void generate_service_processor (t_service* tservice);
   void generate_service_skeleton  (t_service*  tservice);
   void generate_process_function  (t_service* tservice, t_function* tfunction);
-  void generate_function_helpers  (t_function* tfunction);
+  void generate_function_helpers  (t_service* tservice, t_function* tfunction);
 
   /**
    * Serialization constructs