[hydra-commits] file: branch ice/slice-translator-versioning r649 - /ice/branches/slice-trans...

[SVN commits to the Hydra project]

Author: file
Date: Tue Jun  1 11:00:55 2010
New Revision: 649

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=649
Log:
Bit by bit they disappear...

Modified:
    ice/branches/slice-translator-versioning/cpp/src/slice2cpp/Gen.cpp

Modified: ice/branches/slice-translator-versioning/cpp/src/slice2cpp/Gen.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-translator-versioning/cpp/src/slice2cpp/Gen.cpp?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- ice/branches/slice-translator-versioning/cpp/src/slice2cpp/Gen.cpp (original)
+++ ice/branches/slice-translator-versioning/cpp/src/slice2cpp/Gen.cpp Tue Jun  1 11:00:55 2010
@@ -2415,7 +2415,7 @@
 
     ContainerPtr container = p->container();
     ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
-    string clScope = fixKwd(cl->scope());
+    string clScope = fixKwd(suppressedscoped(container, cl->scope(), _suppress));
     string delName = "Callback_" + cl->name() + "_" + name;
     string delNameScoped = clScope + delName;
 
@@ -2782,7 +2782,7 @@
     if(cl->hasMetaData("ami") || p->hasMetaData("ami"))
     {
         string classNameAMI = "AMI_" + cl->name();
-        string classScope = fixKwd(cl->scope());
+        string classScope = fixKwd(suppressedscoped(container, cl->scope(), _suppress));
         string classScopedAMI = classScope + classNameAMI;
         string opScopedAMI = classScopedAMI + "_" + name;
 
@@ -3473,7 +3473,7 @@
 
     ContainerPtr container = p->container();
     ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
-    string thisPointer = fixKwd(cl->scoped()) + "*";
+    string thisPointer = fixKwd(suppressedscoped(container, cl->scope(), _suppress)) + "*";
 
     H << sp;
 
@@ -4582,7 +4582,7 @@
     ContainerPtr container = p->container();
     ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
     string classNameAMD = "AMD_" + cl->name();
-    string classScope = fixKwd(cl->scope());
+    string classScope = fixKwd(suppressedscoped(container, cl->scope(), _suppress));
     string classScopedAMD = classScope + classNameAMD;
 
     string paramsAMD = "(const " + classScopedAMD + '_' + name + "Ptr&, ";
@@ -4838,7 +4838,7 @@
           << "const ::Ice::CallbackPtr& __del"
           << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar << " = 0;";
 
-        string clScope = fixKwd(cl->scope());
+        string clScope = fixKwd(suppressedscoped(container, cl->scope(), _suppress));
         string delName = "Callback_" + cl->name() + "_" + name;
         string delNameScoped = clScope + delName;
 
@@ -5363,7 +5363,7 @@
     }
 
     string clName = cl->name();
-    string clScope = fixKwd(cl->scope());
+    string clScope = fixKwd(suppressedscoped(p->container(), cl->scope(), _suppress));
     string delName = "Callback_" + clName + "_" + p->name();
     string delTmplName = (withCookie ? "Callback_" : "CallbackNC_") + clName + "_" + p->name();
 
@@ -6334,7 +6334,7 @@
     string className = cl->name();
     string classNameAMI = "AMI_" + className;
     string classNameAMD = "AMD_" + className;
-    string classScope = fixKwd(cl->scope());
+    string classScope = fixKwd(suppressedscoped(container, cl->scope(), _suppress));
     string classScopedAMI = classScope + classNameAMI;
     string classScopedAMD = classScope + classNameAMD;
     string proxyName = classScope + className + "Prx";
@@ -6524,7 +6524,7 @@
     string name = p->name();
 
     string classNameAMD = "AMD_" + cl->name();
-    string classScope = fixKwd(cl->scope());
+    string classScope = fixKwd(suppressedscoped(container, cl->scope(), _suppress));
     string classScopedAMD = classScope + classNameAMD;
 
     string params;