diff options
| author | Jose <jose@zeroc.com> | 2013-01-31 16:51:40 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-01-31 16:51:40 +0100 |
| commit | 4d55f11cdf22fbc23e3e7c9f4758566bd05a9471 (patch) | |
| tree | f5c3071ebb27c18dae2fb2585706bd9af8dd92cf /cpp/src/slice2cpp | |
| parent | Fixed ICE-4870 - optional comparison operators on C++ structs (diff) | |
| download | ice-4d55f11cdf22fbc23e3e7c9f4758566bd05a9471.tar.bz2 ice-4d55f11cdf22fbc23e3e7c9f4758566bd05a9471.tar.xz ice-4d55f11cdf22fbc23e3e7c9f4758566bd05a9471.zip | |
Xcode 4.6 - clang 4.2 updates
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.h | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 983f933a7d9..3092153c176 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -1347,7 +1347,7 @@ Slice::Gen::TypesVisitor::emitUpcall(const ExceptionPtr& base, const string& cal } Slice::Gen::ProxyDeclVisitor::ProxyDeclVisitor(Output& h, Output& c, const string& dllExport) : - H(h), C(c), _dllExport(dllExport) + H(h), _dllExport(dllExport) { } @@ -2447,7 +2447,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) } Slice::Gen::DelegateVisitor::DelegateVisitor(Output& h, Output& c, const string& dllExport) : - H(h), C(c), _dllExport(dllExport), _useWstring(false) + H(h), _dllExport(dllExport), _useWstring(false) { } @@ -4860,7 +4860,7 @@ Slice::Gen::ObjectVisitor::emitUpcall(const ClassDefPtr& base, const string& cal } Slice::Gen::AsyncCallbackVisitor::AsyncCallbackVisitor(Output& h, Output& c, const string& dllExport) : - H(h), C(c), _dllExport(dllExport), _useWstring(false) + H(h), _dllExport(dllExport), _useWstring(false) { } @@ -4921,7 +4921,7 @@ Slice::Gen::AsyncCallbackVisitor::visitOperation(const OperationPtr& p) Slice::Gen::AsyncCallbackTemplateVisitor::AsyncCallbackTemplateVisitor(Output& h, Output& c, const string& dllExport) - : H(h), C(c), _dllExport(dllExport), _useWstring(false) + : H(h), _dllExport(dllExport), _useWstring(false) { } @@ -5628,7 +5628,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p) } Slice::Gen::AsyncVisitor::AsyncVisitor(Output& h, Output& c, const string& dllExport) : - H(h), C(c), _dllExport(dllExport), _useWstring(false) + H(h), _dllExport(dllExport), _useWstring(false) { } diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index a8377f6fa35..9bcb600291c 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -119,7 +119,6 @@ private: private: ::IceUtilInternal::Output& H; - ::IceUtilInternal::Output& C; std::string _dllExport; }; @@ -165,7 +164,6 @@ private: private: ::IceUtilInternal::Output& H; - ::IceUtilInternal::Output& C; std::string _dllExport; int _useWstring; @@ -288,7 +286,6 @@ private: private: ::IceUtilInternal::Output& H; - ::IceUtilInternal::Output& C; std::string _dllExport; int _useWstring; @@ -314,7 +311,6 @@ private: void generateOperation(const OperationPtr&, bool); ::IceUtilInternal::Output& H; - ::IceUtilInternal::Output& C; std::string _dllExport; int _useWstring; @@ -367,7 +363,6 @@ private: private: ::IceUtilInternal::Output& H; - ::IceUtilInternal::Output& C; std::string _dllExport; int _useWstring; |