summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/.depend1
-rw-r--r--cpp/src/Ice/Application.cpp26
-rw-r--r--cpp/src/Ice/IdentityUtil.cpp90
-rw-r--r--cpp/src/Ice/Initialize.cpp27
-rw-r--r--cpp/src/Ice/Makefile1
-rw-r--r--cpp/src/Ice/Makefile.mak1
-rw-r--r--cpp/src/Ice/Proxy.cpp56
7 files changed, 1 insertions, 201 deletions
diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index f3b30365530..07dad161960 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -29,7 +29,6 @@ FactoryTableDef$(OBJEXT): FactoryTableDef.cpp $(includedir)/Ice/FactoryTableDef.
FactoryTable$(OBJEXT): FactoryTable.cpp $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Mutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/UserExceptionFactory.h
GC$(OBJEXT): GC.cpp $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/RecMutex.h ../Ice/GC.h $(includedir)/Ice/Config.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h
Identity$(OBJEXT): Identity.cpp $(includedir)/Ice/Identity.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Object.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/StreamF.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/DisableWarnings.h
-IdentityUtil$(OBJEXT): IdentityUtil.cpp $(includedir)/Ice/IdentityUtil.h $(includedir)/Ice/Identity.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/IceUtil/StringUtil.h
ImplicitContextI$(OBJEXT): ImplicitContextI.cpp ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/IceUtil/StaticMutex.h
ImplicitContext$(OBJEXT): ImplicitContext.cpp $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/DisableWarnings.h
IncomingAsync$(OBJEXT): IncomingAsync.cpp $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Object.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Current.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/ServantLocator.h ../Ice/ConnectionI.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h $(includedir)/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../Ice/SelectorThread.h $(includedir)/IceUtil/Timer.h ../Ice/SelectorThreadF.h ../Ice/Selector.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h $(includedir)/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h $(includedir)/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h $(includedir)/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h $(includedir)/Ice/DynamicLibraryF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/PropertiesF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Process.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Properties.h ../Ice/ReplyStatus.h $(includedir)/IceUtil/StaticMutex.h
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 48811380ee8..072630d6c52 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -335,32 +335,6 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initDat
}
int
-Ice::Application::main(int argc, char* argv[], const char* configFile, const Ice::LoggerPtr& logger)
-{
- InitializationData initData;
- if(configFile)
- {
- try
- {
- initData.properties = createProperties();
- initData.properties->load(configFile);
- }
- catch(const std::exception& ex)
- {
- cerr << argv[0] << ex.what() << endl;
- return EXIT_FAILURE;
- }
- catch(...)
- {
- cerr << argv[0] << ": unknown exception" << endl;
- return EXIT_FAILURE;
- }
- }
- initData.logger = logger;
- return main(argc, argv, initData);
-}
-
-int
Ice::Application::main(const StringSeq& args)
{
ArgVector av(args);
diff --git a/cpp/src/Ice/IdentityUtil.cpp b/cpp/src/Ice/IdentityUtil.cpp
deleted file mode 100644
index bfd212c324d..00000000000
--- a/cpp/src/Ice/IdentityUtil.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Ice/IdentityUtil.h>
-#include <Ice/LocalException.h>
-#include <IceUtil/StringUtil.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-Identity
-Ice::stringToIdentity(const string& s)
-{
- Identity ident;
-
- //
- // Find unescaped separator.
- //
- string::size_type slash = string::npos, pos = 0;
- while((pos = s.find('/', pos)) != string::npos)
- {
- if(pos == 0 || s[pos - 1] != '\\')
- {
- if(slash == string::npos)
- {
- slash = pos;
- }
- else
- {
- //
- // Extra unescaped slash found.
- //
- IdentityParseException ex(__FILE__, __LINE__);
- ex.str = s;
- throw ex;
- }
- }
- pos++;
- }
-
- if(slash == string::npos)
- {
- if(!IceUtilInternal::unescapeString(s, 0, s.size(), ident.name))
- {
- IdentityParseException ex(__FILE__, __LINE__);
- ex.str = s;
- throw ex;
- }
- }
- else
- {
- if(!IceUtilInternal::unescapeString(s, 0, slash, ident.category))
- {
- IdentityParseException ex(__FILE__, __LINE__);
- ex.str = s;
- throw ex;
- }
- if(slash + 1 < s.size())
- {
- if(!IceUtilInternal::unescapeString(s, slash + 1, s.size(), ident.name))
- {
- IdentityParseException ex(__FILE__, __LINE__);
- ex.str = s;
- throw ex;
- }
- }
- }
-
- return ident;
-}
-
-string
-Ice::identityToString(const Identity& ident)
-{
- if(ident.category.empty())
- {
- return IceUtilInternal::escapeString(ident.name, "/");
- }
- else
- {
- return IceUtilInternal::escapeString(ident.category, "/") + '/' + IceUtilInternal::escapeString(ident.name, "/");
- }
-}
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 16ad99647a7..a612f498e9a 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -191,33 +191,6 @@ Ice::initialize(const InitializationData& initData, Int version)
return result;
}
-
-CommunicatorPtr
-Ice::initializeWithProperties(int& argc, char* argv[], const PropertiesPtr& properties, Int version)
-{
- InitializationData initData;
- initData.properties = properties;
- return initialize(argc, argv, initData, version);
-}
-
-CommunicatorPtr
-Ice::initializeWithLogger(int& argc, char* argv[], const LoggerPtr& logger, Int version)
-{
- InitializationData initData;
- initData.logger = logger;
- return initialize(argc, argv, initData, version);
-}
-
-CommunicatorPtr
-Ice::initializeWithPropertiesAndLogger(int& argc, char* argv[], const PropertiesPtr& properties,
- const LoggerPtr& logger, Int version)
-{
- InitializationData initData;
- initData.properties = properties;
- initData.logger = logger;
- return initialize(argc, argv, initData, version);
-}
-
InputStreamPtr
Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes)
{
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index b4003cdf66a..07345d8bea9 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -46,7 +46,6 @@ OBJS = Acceptor.o \
FactoryTable.o \
GC.o \
Identity.o \
- IdentityUtil.o \
ImplicitContextI.o \
ImplicitContext.o \
IncomingAsync.o \
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index ae90046613a..70d067a22b3 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -47,7 +47,6 @@ OBJS = Acceptor.obj \
FactoryTable.obj \
GC.obj \
Identity.obj \
- IdentityUtil.obj \
ImplicitContextI.obj \
ImplicitContext.obj \
IncomingAsync.obj \
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 08809f08a76..65828b44e04 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -24,7 +24,7 @@
#include <Ice/LocatorInfo.h>
#include <Ice/BasicStream.h>
#include <Ice/LocalException.h>
-#include <Ice/ConnectionI.h> // To convert from ConnectionIPtr to ConnectionPtr in ice_connection().
+#include <Ice/ConnectionI.h> // To convert from ConnectionIPtr to ConnectionPtr in ice_getConnection().
#include <Ice/Stream.h>
#include <Ice/ImplicitContextI.h>
@@ -85,24 +85,12 @@ IceProxy::Ice::Object::operator<(const Object& r) const
}
Int
-IceProxy::Ice::Object::ice_hash() const
-{
- return ice_getHash();
-}
-
-Int
IceProxy::Ice::Object::ice_getHash() const
{
return _reference->hash();
}
CommunicatorPtr
-IceProxy::Ice::Object::ice_communicator() const
-{
- return ice_getCommunicator();
-}
-
-CommunicatorPtr
IceProxy::Ice::Object::ice_getCommunicator() const
{
return _reference->getCommunicator();
@@ -331,12 +319,6 @@ IceProxy::Ice::Object::ice_identity(const Identity& newIdentity) const
}
}
-ObjectPrx
-IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const
-{
- return ice_identity(newIdentity);
-}
-
Context
IceProxy::Ice::Object::ice_getContext() const
{
@@ -352,12 +334,6 @@ IceProxy::Ice::Object::ice_context(const Context& newContext) const
}
ObjectPrx
-IceProxy::Ice::Object::ice_newContext(const Context& newContext) const
-{
- return ice_context(newContext);
-}
-
-ObjectPrx
IceProxy::Ice::Object::ice_defaultContext() const
{
ObjectPrx proxy = __newInstance();
@@ -386,12 +362,6 @@ IceProxy::Ice::Object::ice_facet(const string& newFacet) const
}
}
-ObjectPrx
-IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const
-{
- return ice_facet(newFacet);
-}
-
string
IceProxy::Ice::Object::ice_getAdapterId() const
{
@@ -413,12 +383,6 @@ IceProxy::Ice::Object::ice_adapterId(const string& newAdapterId) const
}
}
-ObjectPrx
-IceProxy::Ice::Object::ice_newAdapterId(const string& newAdapterId) const
-{
- return ice_adapterId(newAdapterId);
-}
-
EndpointSeq
IceProxy::Ice::Object::ice_getEndpoints() const
{
@@ -452,12 +416,6 @@ IceProxy::Ice::Object::ice_endpoints(const EndpointSeq& newEndpoints) const
}
}
-ObjectPrx
-IceProxy::Ice::Object::ice_newEndpoints(const EndpointSeq& newEndpoints) const
-{
- return ice_endpoints(newEndpoints);
-}
-
Int
IceProxy::Ice::Object::ice_getLocatorCacheTimeout() const
{
@@ -616,12 +574,6 @@ IceProxy::Ice::Object::ice_isCollocationOptimized() const
}
ObjectPrx
-IceProxy::Ice::Object::ice_collocationOptimization(bool b) const
-{
- return ice_collocationOptimized(b);
-}
-
-ObjectPrx
IceProxy::Ice::Object::ice_collocationOptimized(bool b) const
{
if(b == _reference->getCollocationOptimized())
@@ -812,12 +764,6 @@ IceProxy::Ice::Object::ice_threadPerConnection(bool b) const
}
ConnectionPtr
-IceProxy::Ice::Object::ice_connection()
-{
- return ice_getConnection();
-}
-
-ConnectionPtr
IceProxy::Ice::Object::ice_getConnection()
{
int __cnt = 0;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 18:00:31 +0000