diff options
author | Benoit Foucher <benoit@zeroc.com> | 2016-12-12 09:46:34 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-12 09:46:34 +0100 |
commit | 96ef12e46ca56cb28e7bd8c0337df187ba71f666 (patch) | |
tree | d90c54a1c64630bef6353873ef56cca770e061cb /python/modules/IcePy/Operation.cpp | |
parent | Update Nuget package imports to use latest packages (diff) | |
download | ice-96ef12e46ca56cb28e7bd8c0337df187ba71f666.tar.bz2 ice-96ef12e46ca56cb28e7bd8c0337df187ba71f666.tar.xz ice-96ef12e46ca56cb28e7bd8c0337df187ba71f666.zip |
Python build failures on OS X
Diffstat (limited to 'python/modules/IcePy/Operation.cpp')
-rw-r--r-- | python/modules/IcePy/Operation.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
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); |