diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-02-03 10:42:29 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-02-03 10:42:29 +0100 |
| commit | 18a6720fcc3ece576f5fb26283e239cda2bebadd (patch) | |
| tree | a7d9de0acab9e092943fb182fa880b2c4b950db6 /cpp/src/slice2cpp/Gen.h | |
| parent | ICE-6861 - Java stream API changes (diff) | |
| download | ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.bz2 ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.xz ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.zip | |
Refactored invocation code to better suite new C++11 mapping
Diffstat (limited to 'cpp/src/slice2cpp/Gen.h')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index 03944065a74..45a1a577019 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -341,15 +341,19 @@ private: // // C++11 Visitors // - class Cpp11ObjectDeclVisitor : private ::IceUtil::noncopyable, public ParserVisitor + class Cpp11DeclVisitor : private ::IceUtil::noncopyable, public ParserVisitor { public: - Cpp11ObjectDeclVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + Cpp11DeclVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + virtual bool visitUnitStart(const UnitPtr&); + virtual void visitUnitEnd(const UnitPtr&); virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); virtual void visitClassDecl(const ClassDeclPtr&); + virtual bool visitClassDefStart(const ClassDefPtr&); + virtual bool visitExceptionStart(const ExceptionPtr&); virtual void visitOperation(const OperationPtr&); private: @@ -557,7 +561,6 @@ private: virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); virtual bool visitStructStart(const StructPtr&); - virtual bool visitExceptionStart(const ExceptionPtr&); virtual void visitEnum(const EnumPtr&); private: @@ -583,7 +586,7 @@ private: ::IceUtilInternal::Output& H; std::string _dllExport; }; - + class Cpp11ImplVisitor : private ::IceUtil::noncopyable, public ParserVisitor { public: @@ -607,7 +610,7 @@ private: // Generate code to return a dummy value // void writeReturn(::IceUtilInternal::Output&, const TypePtr&, const StringList&); - + // // Get the default value returned for a type // |