diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-03-08 19:37:13 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-03-08 19:37:13 -0500 |
| commit | 11678336dea1f3676881b87bbe8ca3e3cb6b5296 (patch) | |
| tree | ec4bbc16d9fdfe1f9c48f374f26169ba4e88cb3a /cpp/src/slice2cpp | |
| parent | Python thread hook fixes (diff) | |
| download | ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.tar.bz2 ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.tar.xz ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.zip | |
Removed Current's default value in the C++11 mapping
Renamed Ice::noExplicitCurrent to Ice::emptyCurrent
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index de9d75e0f90..930e188c6f2 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2463,11 +2463,9 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter); H << sp; - H << nl << "virtual bool ice_isA" - << "(const ::std::string&, const ::Ice::Current& = ::Ice::noExplicitCurrent) const;"; - H << nl << "virtual ::std::vector< ::std::string> ice_ids" - << "(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;"; - H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;"; + H << nl << "virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;"; + H << nl << "virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;"; + H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;"; H << sp << nl << "static const ::std::string& ice_staticId();"; string flatName = "iceC" + p->flattenedScope() + p->name() + "_ids"; @@ -2995,7 +2993,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) args += ", "; } - params += "const ::Ice::Current& = ::Ice::noExplicitCurrent)"; + params += "const ::Ice::Current& = ::Ice::emptyCurrent)"; paramsDecl += "const ::Ice::Current& current)"; args += "current)"; } @@ -3006,7 +3004,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) args += ')'; } - paramsAMD += "const ::Ice::Current& = ::Ice::noExplicitCurrent)"; + paramsAMD += "const ::Ice::Current& = ::Ice::emptyCurrent)"; argsAMD += "current)"; string isConst = ((p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const")) ? " const" : ""; @@ -6803,10 +6801,10 @@ Slice::Gen::Cpp11InterfaceVisitor::visitClassDefStart(const ClassDefPtr& p) assert(scopedIter != ids.end()); H << sp; - H << nl << "virtual bool ice_isA(::std::string, const ::Ice::Current& = ::Ice::noExplicitCurrent) const override;"; + H << nl << "virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;"; H << nl - << "virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current& = ::Ice::noExplicitCurrent) const override;"; - H << nl << "virtual ::std::string ice_id(const ::Ice::Current& = ::Ice::noExplicitCurrent) const override;"; + << "virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;"; + H << nl << "virtual ::std::string ice_id(const ::Ice::Current&) const override;"; H << sp << nl << "static const ::std::string& ice_staticId();"; string flatName = "iceC" + p->flattenedScope() + p->name() + "_ids"; @@ -7010,7 +7008,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) params.push_back("::std::function<void(::std::exception_ptr)>"); args.push_back("inA->exception()"); } - params.push_back("const ::Ice::Current& = ::Ice::noExplicitCurrent"); + params.push_back("const ::Ice::Current&"); args.push_back("current"); if(cl->isInterface()) |