diff options
| -rw-r--r-- | cpp/src/Slice/PythonUtil.cpp | 5 | ||||
| -rw-r--r-- | python/modules/IcePy/Operation.cpp | 14 |
2 files changed, 7 insertions, 12 deletions
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index c8759a6124c..dbf8d2e95f3 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -187,7 +187,6 @@ private: Output& _out; set<string>& _moduleHistory; - const bool _python3; list<string> _moduleStack; set<string> _classHistory; }; @@ -317,7 +316,7 @@ Slice::Python::ModuleVisitor::visitModuleStart(const ModulePtr& p) // CodeVisitor implementation. // Slice::Python::CodeVisitor::CodeVisitor(Output& out, set<string>& moduleHistory, bool python3) : - _out(out), _moduleHistory(moduleHistory), _python3(python3) + _out(out), _moduleHistory(moduleHistory) { } @@ -1857,7 +1856,7 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax { string sv2 = toStringLiteral(value, "\a\b\f\n\r\t\v", "", Octal, 0); string sv3 = toStringLiteral(value, "\a\b\f\n\r\t\v", "", UCN, 0); - + _out << "\"" << sv2<< "\""; if(sv2 != sv3) { diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp index 6c32d861806..cbcf3b6b4c8 100644 --- a/python/modules/IcePy/Operation.cpp +++ b/python/modules/IcePy/Operation.cpp @@ -372,15 +372,11 @@ class BlobjectServantWrapper : public ServantWrapper { public: - BlobjectServantWrapper(PyObject*, bool); + BlobjectServantWrapper(PyObject*); virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, const pair<const Ice::Byte*, const Ice::Byte*>&, const Ice::Current&); - -private: - - bool _amd; }; struct OperationObject @@ -4572,8 +4568,8 @@ IcePy::TypedServantWrapper::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr // // BlobjectServantWrapper implementation. // -IcePy::BlobjectServantWrapper::BlobjectServantWrapper(PyObject* servant, bool amd) : - ServantWrapper(servant), _amd(amd) +IcePy::BlobjectServantWrapper::BlobjectServantWrapper(PyObject* servant) : + ServantWrapper(servant) { } @@ -4604,11 +4600,11 @@ IcePy::createServantWrapper(PyObject* servant) PyObject* blobjectAsyncType = lookupType("Ice.BlobjectAsync"); if(PyObject_IsInstance(servant, blobjectType)) { - return new BlobjectServantWrapper(servant, false); + return new BlobjectServantWrapper(servant); } else if(PyObject_IsInstance(servant, blobjectAsyncType)) { - return new BlobjectServantWrapper(servant, true); + return new BlobjectServantWrapper(servant); } return new TypedServantWrapper(servant); |