commit d3c71827f87cc25a6469af5fd8f30e38454832e1
author Jens Geyer <jensg@apache.org> Tue May 28 03:09:04 2013 +0200
committer Jens Geyer <jensg@apache.org> Tue May 28 03:09:04 2013 +0200
tree 3fdd349e9ad28db808e3db209d4336a3b3196a9d
parent a5cce17a8d77673f9fc339899cf0e040238d20cc

THRIFT-1977 C# compiler should generate constant files prefixed with thrift file name

Patch: Deniss Afonin & Jens Geyer

compiler/cpp/src/generate/t_csharp_generator.cc

diff --git a/compiler/cpp/src/generate/t_csharp_generator.cc b/compiler/cpp/src/generate/t_csharp_generator.cc
index a1041fd..26f1bdf 100644
--- a/compiler/cpp/src/generate/t_csharp_generator.cc
+++ b/compiler/cpp/src/generate/t_csharp_generator.cc
@@ -291,7 +291,7 @@
   if (consts.empty()){
     return;
   }
-  string f_consts_name = namespace_dir_ + "/Constants.cs";
+  string f_consts_name = namespace_dir_ + '/' + program_name_ +  ".Constants.cs";
   ofstream f_consts;
   f_consts.open(f_consts_name.c_str());
 
@@ -302,7 +302,7 @@
   start_csharp_namespace(f_consts);
 
   indent(f_consts) <<
-    "public class Constants" << endl;
+    "public static class " << program_name_ << "Constants" << endl;
   scope_up(f_consts);
 
   vector<t_const*>::iterator c_iter;
@@ -372,7 +372,7 @@
 }
 
 void t_csharp_generator::print_const_constructor(std::ofstream& out, std::vector<t_const*> consts) {
-  indent(out) << "static Constants()" << endl;
+  indent(out) << "static " << program_name_ << "Constants()" << endl;
   scope_up(out);
   vector<t_const*>::iterator c_iter;
   for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {