diff options
Diffstat (limited to 'cpp/src/slice2java')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 12 | ||||
| -rw-r--r-- | cpp/src/slice2java/GenCompat.cpp | 18 |
2 files changed, 25 insertions, 5 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index ae85e3731b7..011f11e0e4b 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -1146,7 +1146,11 @@ Slice::JavaVisitor::writeDispatch(Output& out, const ClassDefPtr& p) ClassList allBases = p->allBases(); StringList ids; #ifdef ICE_CPP11_COMPILER - transform(allBases.begin(), allBases.end(), back_inserter(ids), [](const auto& it) { return it->scoped(); }); + transform(allBases.begin(), allBases.end(), back_inserter(ids), + [](const ContainedPtr& it) + { + return it->scoped(); + }); #else transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun(&Contained::scoped)); #endif @@ -1393,7 +1397,11 @@ Slice::JavaVisitor::writeDispatch(Output& out, const ClassDefPtr& p) { StringList allOpNames; #ifdef ICE_CPP11_COMPILER - transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), [](const auto& it) { return it->name(); }); + transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), + [](const ContainedPtr& it) + { + return it->name(); + }); #else transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), constMemFun(&Contained::name)); #endif diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index a9f67d0ed08..5d2985afce5 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -1108,7 +1108,11 @@ Slice::JavaCompatVisitor::writeDispatchAndMarshalling(Output& out, const ClassDe ClassList allBases = p->allBases(); StringList ids; #ifdef ICE_CPP11_COMPILER - transform(allBases.begin(), allBases.end(), back_inserter(ids), [](const auto& it) { return it->scoped(); }); + transform(allBases.begin(), allBases.end(), back_inserter(ids), + [](const ContainedPtr& it) + { + return it->scoped(); + }); #else transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun(&Contained::scoped)); #endif @@ -1544,7 +1548,11 @@ Slice::JavaCompatVisitor::writeDispatchAndMarshalling(Output& out, const ClassDe { StringList allOpNames; #ifdef ICE_CPP11_COMPILER - transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), [](const auto& it) { return it->name(); }); + transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), + [](const ContainedPtr& it) + { + return it->name(); + }); #else transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), constMemFun(&Contained::name)); #endif @@ -4888,7 +4896,11 @@ Slice::GenCompat::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) ClassList allBases = p->allBases(); StringList ids; #ifdef ICE_CPP11_COMPILER - transform(allBases.begin(), allBases.end(), back_inserter(ids), [](const auto& it) { return it->scoped(); }); + transform(allBases.begin(), allBases.end(), back_inserter(ids), + [](const ContainedPtr& it) + { + return it->scoped(); + }); #else transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun(&Contained::scoped)); #endif |