diff options
| author | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
| commit | 3e685a12bfd92a4ffd86c808ba0f34df907de5c8 (patch) | |
| tree | 2ef8fb8e028d4f14d1516a98f2a18dbadb46a5d7 /cpp/src/Slice/PythonUtil.cpp | |
| parent | Update to latest gradle builder (diff) | |
| parent | AIX port (diff) | |
| download | ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.bz2 ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.xz ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/Slice/PythonUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/PythonUtil.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 699bd08ef97..eb637229825 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -518,17 +518,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) // ClassList allBases = p->allBases(); StringList ids; -#if defined(__IBMCPP__) && defined(NDEBUG) -// -// VisualAge C++ 6.0 does not see that ClassDef is a Contained, -// when inlining is on. The code below issues a warning: better -// than an error! -// - transform(allBases.begin(), allBases.end(), back_inserter(ids), - IceUtil::constMemFun<string,ClassDef>(&Contained::scoped)); -#else transform(allBases.begin(), allBases.end(), back_inserter(ids), IceUtil::constMemFun(&Contained::scoped)); -#endif StringList other; other.push_back(scoped); other.push_back("::Ice::Object"); |