diff options
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 29fc2c88857..c9f848fde29 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -34,7 +34,6 @@ #include <Ice/PluginManagerI.h> #include <Ice/Initialize.h> #include <IceUtil/StringUtil.h> -#include <Ice/MemoryPool.h> #include <stdio.h> @@ -452,12 +451,6 @@ IceInternal::Instance::identityToString(const Identity& ident) const } } -IceInternal::MemoryPool* -IceInternal::Instance::memoryPool() const -{ - return _memoryPool; -} - IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const InitializationData& initData) : _state(StateActive), _initData(initData), @@ -467,7 +460,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _threadPerConnection(0), _threadPerConnectionStackSize(0), _defaultContext(new SharedContext), - _memoryPool(0), _implicitContext(0) { try @@ -681,19 +673,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _pluginManager = new PluginManagerI(communicator, _dynamicLibraryList); - if(_initData.properties->getPropertyAsIntWithDefault("Ice.MemoryPool", 0) == 1) - { - - // - // High watermark defaults to 4 * max page size. - // - size_t highWaterMark = _initData.properties->getPropertyAsIntWithDefault("Ice.MemoryPool.HighWaterMark", 128); - const size_t megaByte = 1024 * 1024; - - highWaterMark *= megaByte; - _memoryPool = new MemoryPool(highWaterMark); - } - _outgoingConnectionFactory = new OutgoingConnectionFactory(this); _servantFactoryManager = new ObjectFactoryManager(); @@ -725,7 +704,6 @@ IceInternal::Instance::~Instance() assert(!_referenceFactory); assert(!_proxyFactory); assert(!_outgoingConnectionFactory); - delete _memoryPool; assert(!_connectionMonitor); assert(!_servantFactoryManager); |