diff options
| author | Joe George <joe@zeroc.com> | 2015-12-29 14:42:15 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-12-29 14:45:23 -0500 |
| commit | 6cf97628982b6a0ab7063009f92ac81b3c84e0d1 (patch) | |
| tree | 8370194405d1a7a51967774fb41c0008f4d53ffc /cpp/src/slice2cpp/Gen.h | |
| parent | Fix IceBT C++11 build (diff) | |
| download | ice-6cf97628982b6a0ab7063009f92ac81b3c84e0d1.tar.bz2 ice-6cf97628982b6a0ab7063009f92ac81b3c84e0d1.tar.xz ice-6cf97628982b6a0ab7063009f92ac81b3c84e0d1.zip | |
Fix ICE-6947
Pass in-parameters for local interfaces with delegate metadata by value
in C++11
Diffstat (limited to 'cpp/src/slice2cpp/Gen.h')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index 72ba8d8e37a..da1f460529d 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -367,7 +367,7 @@ private: { public: - Cpp11TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + Cpp11TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); @@ -390,7 +390,6 @@ private: ::IceUtilInternal::Output& C; std::string _dllExport; - bool _stream; bool _doneStaticSymbol; int _useWstring; std::list<int> _useWstringHist; @@ -438,7 +437,7 @@ private: std::string _dllExport; }; - + class Cpp11ObjectVisitor : public ParserVisitor { public: @@ -460,7 +459,7 @@ private: int _useWstring; std::list<int> _useWstringHist; }; - + class Cpp11LocalObjectVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor { public: @@ -475,7 +474,7 @@ private: virtual bool visitStructStart(const StructPtr&); virtual void visitOperation(const OperationPtr&); }; - + class Cpp11InterfaceVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor { public: @@ -491,7 +490,7 @@ private: virtual void visitOperation(const OperationPtr&); void emitUpcall(const ClassDefPtr&, const std::string&); }; - + class Cpp11ValueVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor { public: @@ -528,7 +527,7 @@ private: int _useWstring; std::list<int> _useWstringHist; }; - + class Cpp11AsyncImplVisitor : private ::IceUtil::noncopyable, public ParserVisitor { public: @@ -571,7 +570,7 @@ private: ::IceUtilInternal::Output& C; std::string _dllExport; }; - + class Cpp11InterfaceTraitsVisitor : private ::IceUtil::noncopyable, public ParserVisitor { public: |