diff options
Diffstat (limited to 'python')
-rw-r--r-- | python/modules/IcePy/Communicator.cpp | 5 | ||||
-rw-r--r-- | python/modules/IcePy/Logger.cpp | 2 | ||||
-rw-r--r-- | python/modules/IcePy/ObjectAdapter.cpp | 2 | ||||
-rw-r--r-- | python/modules/IcePy/Properties.cpp | 2 | ||||
-rw-r--r-- | python/modules/IcePy/Proxy.cpp | 1 | ||||
-rw-r--r-- | python/modules/IcePy/Types.h | 1 | ||||
-rw-r--r-- | python/python/Ice/__init__.py | 1 | ||||
-rw-r--r-- | python/test/Ice/admin/AllTests.py | 1 | ||||
-rwxr-xr-x | python/test/Ice/blobject/Server.py | 1 | ||||
-rw-r--r-- | python/test/Ice/defaultValue/Test.ice | 1 | ||||
-rw-r--r-- | python/test/Ice/exceptions/AllTests.py | 2 | ||||
-rw-r--r-- | python/test/Ice/operations/Twoways.py | 1 | ||||
-rw-r--r-- | python/test/Ice/operations/TwowaysAMI.py | 1 | ||||
-rw-r--r-- | python/test/Ice/properties/Client.py | 2 | ||||
-rw-r--r-- | python/test/Ice/properties/config/escapes.cfg | 1 | ||||
-rw-r--r-- | python/test/Ice/proxy/AllTests.py | 1 | ||||
-rw-r--r-- | python/test/Ice/servantLocator/TestActivationAMDI.py | 1 | ||||
-rw-r--r-- | python/test/Ice/servantLocator/TestActivationI.py | 1 | ||||
-rw-r--r-- | python/test/Ice/timeout/AllTests.py | 1 |
19 files changed, 0 insertions, 28 deletions
diff --git a/python/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp index ef4472f325f..89cb5f8030d 100644 --- a/python/modules/IcePy/Communicator.cpp +++ b/python/modules/IcePy/Communicator.cpp @@ -1147,7 +1147,6 @@ communicatorFindAdminFacet(CommunicatorObject* self, PyObject* args) return Py_None; } - #ifdef WIN32 extern "C" #endif @@ -1175,7 +1174,6 @@ communicatorFindAllAdminFacets(CommunicatorObject* self) PyTypeObject* objectType = reinterpret_cast<PyTypeObject*>(lookupType("Ice.Object")); PyObjectHandle plainObject = objectType->tp_alloc(objectType, 0); - for(Ice::FacetMap::const_iterator p = facetMap.begin(); p != facetMap.end(); ++p) { @@ -1204,8 +1202,6 @@ communicatorFindAllAdminFacets(CommunicatorObject* self) return result.release(); } - - #ifdef WIN32 extern "C" #endif @@ -1434,7 +1430,6 @@ communicatorGetImplicitContext(CommunicatorObject* self) return createImplicitContext(implicitContext); } - #ifdef WIN32 extern "C" #endif diff --git a/python/modules/IcePy/Logger.cpp b/python/modules/IcePy/Logger.cpp index 68357c8dadb..b98320375dc 100644 --- a/python/modules/IcePy/Logger.cpp +++ b/python/modules/IcePy/Logger.cpp @@ -101,7 +101,6 @@ IcePy::LoggerWrapper::getPrefix() return getString(tmp.get()); } - Ice::LoggerPtr IcePy::LoggerWrapper::cloneWithPrefix(const string& prefix) { @@ -307,7 +306,6 @@ loggerGetPrefix(LoggerObject* self) return createString(prefix); } - #ifdef WIN32 extern "C" #endif diff --git a/python/modules/IcePy/ObjectAdapter.cpp b/python/modules/IcePy/ObjectAdapter.cpp index 9beb09d1f52..7f9410b431d 100644 --- a/python/modules/IcePy/ObjectAdapter.cpp +++ b/python/modules/IcePy/ObjectAdapter.cpp @@ -1513,7 +1513,6 @@ adapterSetLocator(ObjectAdapterObject* self, PyObject* args) return Py_None; } - #ifdef WIN32 extern "C" #endif @@ -1676,7 +1675,6 @@ adapterSetPublishedEndpoints(ObjectAdapterObject* self, PyObject* args) return Py_None; } - static PyMethodDef AdapterMethods[] = { { STRCAST("getName"), reinterpret_cast<PyCFunction>(adapterGetName), METH_NOARGS, diff --git a/python/modules/IcePy/Properties.cpp b/python/modules/IcePy/Properties.cpp index bbcca6b179b..579853e02c2 100644 --- a/python/modules/IcePy/Properties.cpp +++ b/python/modules/IcePy/Properties.cpp @@ -406,8 +406,6 @@ propertiesGetPropertyAsListWithDefault(PropertiesObject* self, PyObject* args) return list; } - - #ifdef WIN32 extern "C" #endif diff --git a/python/modules/IcePy/Proxy.cpp b/python/modules/IcePy/Proxy.cpp index fd44da8defc..be082198227 100644 --- a/python/modules/IcePy/Proxy.cpp +++ b/python/modules/IcePy/Proxy.cpp @@ -1142,7 +1142,6 @@ proxyIceSecure(ProxyObject* self, PyObject* args) return createProxy(newProxy, *self->communicator, reinterpret_cast<PyObject*>(Py_TYPE(self))); } - #ifdef WIN32 extern "C" #endif diff --git a/python/modules/IcePy/Types.h b/python/modules/IcePy/Types.h index eb122bc6171..5ca3d2296dc 100644 --- a/python/modules/IcePy/Types.h +++ b/python/modules/IcePy/Types.h @@ -30,7 +30,6 @@ class ClassInfo; typedef IceUtil::Handle<ClassInfo> ClassInfoPtr; typedef std::vector<ClassInfoPtr> ClassInfoList; - class ValueInfo; typedef IceUtil::Handle<ValueInfo> ValueInfoPtr; diff --git a/python/python/Ice/__init__.py b/python/python/Ice/__init__.py index 207ad392129..500d2e5aa27 100644 --- a/python/python/Ice/__init__.py +++ b/python/python/Ice/__init__.py @@ -1317,7 +1317,6 @@ class ImplicitContextI(ImplicitContext): def remove(self, key): return self._impl.remove(key) - # # Its not possible to block in a python signal handler since this # blocks the main thread from doing further work. As such we queue the diff --git a/python/test/Ice/admin/AllTests.py b/python/test/Ice/admin/AllTests.py index 6f590408f6f..4a025ed3953 100644 --- a/python/test/Ice/admin/AllTests.py +++ b/python/test/Ice/admin/AllTests.py @@ -71,7 +71,6 @@ def testFacets(com, builtInFacets = True): except Ice.NotRegisteredException: pass # Expected - def allTests(communicator): sys.stdout.write("testing communicator operations... ") sys.stdout.flush() diff --git a/python/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py index ce5c7dae040..09fb77c6286 100755 --- a/python/test/Ice/blobject/Server.py +++ b/python/test/Ice/blobject/Server.py @@ -29,7 +29,6 @@ class TestI(Test.Hello): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() - def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") diff --git a/python/test/Ice/defaultValue/Test.ice b/python/test/Ice/defaultValue/Test.ice index 64021441f21..d0288b398e4 100644 --- a/python/test/Ice/defaultValue/Test.ice +++ b/python/test/Ice/defaultValue/Test.ice @@ -23,7 +23,6 @@ enum Color { red, green, blue } } - struct Struct1 { bool boolFalse = false; diff --git a/python/test/Ice/exceptions/AllTests.py b/python/test/Ice/exceptions/AllTests.py index fdfc2bddca6..4fb500d88b4 100644 --- a/python/test/Ice/exceptions/AllTests.py +++ b/python/test/Ice/exceptions/AllTests.py @@ -237,7 +237,6 @@ def allTests(communicator): except Ice.IllegalServantException: pass - adapter.remove(Ice.stringToIdentity("x")) try: adapter.remove(Ice.stringToIdentity("x")) @@ -464,7 +463,6 @@ def allTests(communicator): print("ok") - if thrower.ice_getConnection(): sys.stdout.write("testing memory limit marshal exception..."); sys.stdout.flush(); diff --git a/python/test/Ice/operations/Twoways.py b/python/test/Ice/operations/Twoways.py index 53489803ce5..a90c1649a8a 100644 --- a/python/test/Ice/operations/Twoways.py +++ b/python/test/Ice/operations/Twoways.py @@ -1308,7 +1308,6 @@ def twoways(communicator, p): for j in range(len(r)): test(r[j] == -j) - # # opContext # diff --git a/python/test/Ice/operations/TwowaysAMI.py b/python/test/Ice/operations/TwowaysAMI.py index 735e526b68a..90c7299635e 100644 --- a/python/test/Ice/operations/TwowaysAMI.py +++ b/python/test/Ice/operations/TwowaysAMI.py @@ -1177,7 +1177,6 @@ def twowaysAMI(communicator, p): derived.begin_opDerived(cb.opDerived, cb.exCB) cb.check() - r = p.begin_opByte1(0xFF) test(p.end_opByte1(r) == 0xFF) diff --git a/python/test/Ice/properties/Client.py b/python/test/Ice/properties/Client.py index b9774d51f92..7d14c2bccc8 100644 --- a/python/test/Ice/properties/Client.py +++ b/python/test/Ice/properties/Client.py @@ -9,7 +9,6 @@ # # ********************************************************************** - import os, sys, traceback import Ice @@ -26,7 +25,6 @@ class Client(Ice.Application): test(properties.getProperty("Ice.ProgramName") == "PropertiesClient") test(self.appName() == properties.getProperty("Ice.ProgramName")) - sys.stdout.write("testing load properties from UTF-8 path... ") sys.stdout.flush() properties = Ice.createProperties() diff --git a/python/test/Ice/properties/config/escapes.cfg b/python/test/Ice/properties/config/escapes.cfg index bd7c16643d9..a9d91a0a19f 100644 --- a/python/test/Ice/properties/config/escapes.cfg +++ b/python/test/Ice/properties/config/escapes.cfg @@ -22,7 +22,6 @@ foo\=bar=1 # Name is "foo=bar", value is "1" foo\#bar = 2 # Name is "foo#bar", value is "2" foo bar =3 # Name is "foo bar", value is "3" - A=1 # Name is "A", value is "1" B= 2 3 4 # Name is "B", value is "2 3 4" C=5=\#6 # 7 # Name is "C", value is "5=#6" diff --git a/python/test/Ice/proxy/AllTests.py b/python/test/Ice/proxy/AllTests.py index 8c34f28cc29..75ba821c0fa 100644 --- a/python/test/Ice/proxy/AllTests.py +++ b/python/test/Ice/proxy/AllTests.py @@ -359,7 +359,6 @@ def allTests(communicator, collocated): sys.stdout.write("testing proxy methods... ") sys.stdout.flush() - test(communicator.identityToString(base.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()) \ == "other") diff --git a/python/test/Ice/servantLocator/TestActivationAMDI.py b/python/test/Ice/servantLocator/TestActivationAMDI.py index 4c54569c4b2..0eac2d1cf80 100644 --- a/python/test/Ice/servantLocator/TestActivationAMDI.py +++ b/python/test/Ice/servantLocator/TestActivationAMDI.py @@ -10,7 +10,6 @@ import os, sys, traceback, time import Ice, Test, TestAMDI - class TestActivationAMDI(Test.TestActivation): def activateServantLocator(self, activate, current=None): diff --git a/python/test/Ice/servantLocator/TestActivationI.py b/python/test/Ice/servantLocator/TestActivationI.py index 1e52844a9f5..3e9b28d8154 100644 --- a/python/test/Ice/servantLocator/TestActivationI.py +++ b/python/test/Ice/servantLocator/TestActivationI.py @@ -10,7 +10,6 @@ import os, sys, traceback, time import Ice, Test, TestI - class TestActivationI(Test.TestActivation): def activateServantLocator(self, activate, current=None): diff --git a/python/test/Ice/timeout/AllTests.py b/python/test/Ice/timeout/AllTests.py index 986fb129380..b1a521e925f 100644 --- a/python/test/Ice/timeout/AllTests.py +++ b/python/test/Ice/timeout/AllTests.py @@ -272,5 +272,4 @@ def allTests(communicator): print("ok") - return timeout |