summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/slice2cppe/Gen.cpp24
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>";