diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2005-06-30 15:10:50 +0000 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2005-06-30 15:10:50 +0000 |
commit | 524f67a378cd495d4e9d7f254467be1fa3613e90 (patch) | |
tree | 74d072d935462e6056b950429f8a17bd91675513 /cpp/src/slice2cppe | |
parent | Changed to the observer interfaces. (diff) | |
download | ice-524f67a378cd495d4e9d7f254467be1fa3613e90.tar.bz2 ice-524f67a378cd495d4e9d7f254467be1fa3613e90.tar.xz ice-524f67a378cd495d4e9d7f254467be1fa3613e90.zip |
Removed ICE_NO_ROUTER & ICE_NO_LOCATOR
Diffstat (limited to 'cpp/src/slice2cppe')
-rw-r--r-- | cpp/src/slice2cppe/Gen.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp index 51933ca3de6..d04bbb6061e 100644 --- a/cpp/src/slice2cppe/Gen.cpp +++ b/cpp/src/slice2cppe/Gen.cpp @@ -1165,24 +1165,20 @@ Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p) H << sp << nl << "virtual ::IceInternal::Handle< ::IceDelegate::Ice::Object> __createDelegate();"; H << eb << ';'; + string flatName = p->flattenedScope() + p->name() + "_ids"; + + StringList ids; + getIds(p, ids); + + StringList::const_iterator firstIter = ids.begin(); + StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped()); + assert(scopedIter != ids.end()); + StringList::difference_type scopedPos = ice_distance(firstIter, scopedIter); C << sp; C << nl << "const ::std::string&" << nl << "IceProxy" << scoped << "::ice_staticId()"; C << sb; - if(!_ice) - { - string flatName = p->flattenedScope() + p->name() + "_ids"; - - StringList ids; - getIds(p, ids); - - StringList::const_iterator firstIter = ids.begin(); - StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped()); - assert(scopedIter != ids.end()); - StringList::difference_type scopedPos = ice_distance(firstIter, scopedIter); - - C << nl << "return " << flatName << '[' << scopedPos << "];"; - } + C << nl << "return " << flatName << '[' << scopedPos << "];"; C << eb; C << sp << nl << "::IceInternal::Handle< ::IceDelegate::Ice::Object>"; |