From: Roger Meier <roger@apache.org>
Date: Sat, 20 Oct 2012 21:18:43 +0000 (+0000)
Subject: THRIFT-1731 error: expected identifier before ';' token
X-Git-Tag: 0.9.1~264
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=cc6ea425b74a5ee8e8d508b10aa0f78d1ccc0807;p=common%2Fthrift.git

THRIFT-1731 error: expected identifier before ';' token
Patch: Martin Vogt


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

diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index 9b960bf4..c1287b7d 100644
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -1999,7 +1999,10 @@ void t_cpp_generator::generate_service_async_skeleton(t_service* tservice) {
     "using boost::shared_ptr;" << endl <<
     endl;
 
-  if (!ns.empty()) {
+  // the following code would not compile:
+  // using namespace ;
+  // using namespace ::;
+  if ( (!ns.empty()) && (ns.compare(" ::") != 0)) {
     f_skeleton <<
       "using namespace " << string(ns, 0, ns.size()-2) << ";" << endl <<
       endl;
@@ -3739,7 +3742,10 @@ void t_cpp_generator::generate_service_skeleton(t_service* tservice) {
     "using boost::shared_ptr;" << endl <<
     endl;
 
-  if (!ns.empty()) {
+  // the following code would not compile:
+  // using namespace ;
+  // using namespace ::;
+  if ( (!ns.empty()) && (ns.compare(" ::") != 0)) {
     f_skeleton <<
       "using namespace " << string(ns, 0, ns.size()-2) << ";" << endl <<
       endl;