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

[SVN commits to the Hydra project]

Author: file
Date: Wed Jun  2 07:46:11 2010
New Revision: 652

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=652
Log:
Fix up preserving type ids for exceptions.

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=652&r1=651&r2=652
==============================================================================
--- ice/branches/slice-translator-versioning/cpp/src/slice2cpp/Gen.cpp (original)
+++ ice/branches/slice-translator-versioning/cpp/src/slice2cpp/Gen.cpp Wed Jun  2 07:46:11 2010
@@ -796,7 +796,7 @@
 
     string flatName = suppressedflattenedScope(p->container(), p->flattenedScope(), _suppress) + p->name() + "_name";
 
-    C << sp << nl << "static const char* " << flatName << " = \"" << suppressedscoped(p->container(), p->scoped(), _suppress).substr(2) << "\";";
+    C << sp << nl << "static const char* " << flatName << " = \"" << p->scoped().substr(2) << "\";";
     C << sp << nl << "::std::string" << nl << scoped.substr(2) << "::ice_name() const";
     C << sb;
     C << nl << "return " << flatName << ';';
@@ -860,7 +860,7 @@
         
         C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const";
         C << sb;
-        C << nl << "__os->write(::std::string(\"" << suppressedscoped(p->container(), p->scoped(), _suppress) << "\"), false);";
+        C << nl << "__os->write(::std::string(\"" << p->scoped() << "\"), false);";
         C << nl << "__os->startWriteSlice();";
         for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
@@ -1010,12 +1010,12 @@
         C.inc();
         C << sp << nl << factoryName << "__Init()";
         C << sb;
-        C << nl << "::IceInternal::factoryTable->addExceptionFactory(\"" << suppressedscoped(p->container(), p->scoped(), _suppress) << "\", " << scoped
+        C << nl << "::IceInternal::factoryTable->addExceptionFactory(\"" << p->scoped() << "\", " << scoped
           << "::ice_factory());";
         C << eb;
         C << sp << nl << "~" << factoryName << "__Init()";
         C << sb;
-        C << nl << "::IceInternal::factoryTable->removeExceptionFactory(\"" << suppressedscoped(p->container(), p->scoped(), _suppress) << "\");";
+        C << nl << "::IceInternal::factoryTable->removeExceptionFactory(\"" << p->scoped() << "\");";
         C << eb;
         C << eb << ';';
         C << sp << nl << "static " << factoryName << "__Init "<< factoryName << "__i;";