summaryrefslogtreecommitdiff
path: root/py/modules/IcePy/Proxy.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-05-11 12:33:14 -0230
committerDwayne Boone <dwayne@zeroc.com>2009-05-11 12:33:14 -0230
commit1fb6c38f2f6e33e3ef804aafda324c1bcb0ac7b5 (patch)
treed95f06135aa5844e5d914e8bb37b96d4b2401dca /py/modules/IcePy/Proxy.cpp
parentBug 3885 - do not use localhost as node name in demos (diff)
downloadice-1fb6c38f2f6e33e3ef804aafda324c1bcb0ac7b5.tar.bz2
ice-1fb6c38f2f6e33e3ef804aafda324c1bcb0ac7b5.tar.xz
ice-1fb6c38f2f6e33e3ef804aafda324c1bcb0ac7b5.zip
Bug 3878 - remove some deprecated features
Diffstat (limited to 'py/modules/IcePy/Proxy.cpp')
-rw-r--r--py/modules/IcePy/Proxy.cpp26
1 files changed, 0 insertions, 26 deletions
diff --git a/py/modules/IcePy/Proxy.cpp b/py/modules/IcePy/Proxy.cpp
index 40128d8756d..f47fc1e38a7 100644
--- a/py/modules/IcePy/Proxy.cpp
+++ b/py/modules/IcePy/Proxy.cpp
@@ -409,30 +409,6 @@ proxyIceContext(ProxyObject* self, PyObject* args)
extern "C"
#endif
static PyObject*
-proxyIceDefaultContext(ProxyObject* self)
-{
- PyErr_Warn(PyExc_DeprecationWarning, STRCAST("ice_defaultContext is deprecated."));
- assert(self->proxy);
-
- Ice::ObjectPrx newProxy;
- try
- {
- newProxy = (*self->proxy)->ice_defaultContext();
- }
- catch(const Ice::Exception& ex)
- {
- setPythonException(ex);
- return 0;
- }
-
- PyTypeObject* type = self->ob_type; // Necessary to prevent GCC's strict-alias warnings.
- return createProxy(newProxy, *self->communicator, reinterpret_cast<PyObject*>(type));
-}
-
-#ifdef WIN32
-extern "C"
-#endif
-static PyObject*
proxyIceGetFacet(ProxyObject* self)
{
assert(self->proxy);
@@ -1931,8 +1907,6 @@ static PyMethodDef ProxyMethods[] =
PyDoc_STR(STRCAST("ice_getContext() -> dict")) },
{ STRCAST("ice_context"), reinterpret_cast<PyCFunction>(proxyIceContext), METH_VARARGS,
PyDoc_STR(STRCAST("ice_context(dict) -> Ice.ObjectPrx")) },
- { STRCAST("ice_defaultContext"), reinterpret_cast<PyCFunction>(proxyIceDefaultContext), METH_NOARGS,
- PyDoc_STR(STRCAST("ice_defaultContext() -> Ice.ObjectPrx")) },
{ STRCAST("ice_getFacet"), reinterpret_cast<PyCFunction>(proxyIceGetFacet), METH_NOARGS,
PyDoc_STR(STRCAST("ice_getFacet() -> string")) },
{ STRCAST("ice_facet"), reinterpret_cast<PyCFunction>(proxyIceFacet), METH_VARARGS,