diff options
| author | Jose <jose@zeroc.com> | 2016-01-13 13:27:50 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-13 13:27:50 +0100 |
| commit | dee599627d8b4228a0efd47f2480749edf399a39 (patch) | |
| tree | 5ea0106f67816a34858314b2bf3e75a5e603423c /cpp/src/slice2cpp/Gen.cpp | |
| parent | Minor fix to ICE_VALUE_FACTORY macro (diff) | |
| download | ice-dee599627d8b4228a0efd47f2480749edf399a39.tar.bz2 ice-dee599627d8b4228a0efd47f2480749edf399a39.tar.xz ice-dee599627d8b4228a0efd47f2480749edf399a39.zip | |
Use Ice::noExplicitCurrent as C++ Current default parameter
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 5c843c0d631..f9a232e05e0 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2580,10 +2580,10 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) H << sp; H << nl << "virtual bool ice_isA" - << "(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;"; + << "(const ::std::string&, const ::Ice::Current& = ::Ice::noExplicitCurrent) const;"; H << nl << "virtual ::std::vector< ::std::string> ice_ids" - << "(const ::Ice::Current& = ::Ice::Current()) const;"; - H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;"; + << "(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;"; + H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;"; H << nl << "static const ::std::string& ice_staticId();"; if(!dataMembers.empty()) @@ -3181,7 +3181,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) args += ", "; } - params += "const ::Ice::Current& = ::Ice::Current())"; + params += "const ::Ice::Current& = ::Ice::noExplicitCurrent)"; paramsDecl += "const ::Ice::Current& __current)"; args += "__current)"; } @@ -3192,7 +3192,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) args += ')'; } - paramsAMD += "const ::Ice::Current& = ::Ice::Current())"; + paramsAMD += "const ::Ice::Current& = ::Ice::noExplicitCurrent)"; paramsDeclAMD += "const ::Ice::Current& __current)"; argsAMD += "__current)"; @@ -7168,10 +7168,10 @@ Slice::Gen::Cpp11InterfaceVisitor::visitClassDefStart(const ClassDefPtr& p) H << sp; H << nl << "virtual bool ice_isA" - << "(::std::string, const ::Ice::Current& = ::Ice::Current()) const;"; + << "(::std::string, const ::Ice::Current& = ::Ice::noExplicitCurrent) const;"; H << nl << "virtual ::std::vector< ::std::string> ice_ids" - << "(const ::Ice::Current& = ::Ice::Current()) const;"; - H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;"; + << "(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;"; + H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;"; H << nl << "static const ::std::string& ice_staticId();"; string flatName = p->flattenedScope() + p->name() + (p->isInterface() ? "" : "Disp") + "_ids"; @@ -7409,7 +7409,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) args += ", "; } - params += "const ::Ice::Current& = ::Ice::Current())"; + params += "const ::Ice::Current& = ::Ice::noExplicitCurrent)"; paramsDecl += "const ::Ice::Current& __current)"; args += "__current)"; |