summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Connection.cpp16
-rw-r--r--cpp/src/Ice/Connection.h4
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp24
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.cpp (renamed from cpp/src/Ice/DefaultsAndOverwrites.cpp)28
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.h (renamed from cpp/src/Ice/DefaultsAndOverwrites.h)18
-rw-r--r--cpp/src/Ice/DefaultsAndOverridesF.h (renamed from cpp/src/Ice/DefaultsAndOverwritesF.h)12
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.cpp4
-rw-r--r--cpp/src/Ice/Instance.cpp14
-rw-r--r--cpp/src/Ice/Instance.h6
-rw-r--r--cpp/src/Ice/Makefile2
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.cpp4
-rw-r--r--cpp/src/Ice/TcpEndpoint.cpp4
-rw-r--r--cpp/src/Ice/UdpEndpoint.cpp4
13 files changed, 70 insertions, 70 deletions
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index b3aff7f0b2f..044c36f549f 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -13,7 +13,7 @@
#include <Ice/LoggerUtil.h>
#include <Ice/Properties.h>
#include <Ice/TraceUtil.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
#include <Ice/Transceiver.h>
#include <Ice/ThreadPool.h>
#include <Ice/ObjectAdapter.h>
@@ -123,9 +123,9 @@ IceInternal::Connection::sendRequest(Outgoing* out, bool oneway, bool comp)
}
else
{
- if (_defaultsAndOverwrites->overwriteCompress)
+ if (_defaultsAndOverrides->overrideComppress)
{
- comp = _defaultsAndOverwrites->overwriteCompressValue;
+ comp = _defaultsAndOverrides->overrideComppressValue;
}
}
@@ -263,9 +263,9 @@ IceInternal::Connection::flushBatchRequest(bool comp)
}
else
{
- if (_defaultsAndOverwrites->overwriteCompress)
+ if (_defaultsAndOverrides->overrideComppress)
{
- comp = _defaultsAndOverwrites->overwriteCompressValue;
+ comp = _defaultsAndOverrides->overrideComppressValue;
}
}
@@ -674,9 +674,9 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa
}
else
{
- if (_defaultsAndOverwrites->overwriteCompress)
+ if (_defaultsAndOverrides->overrideComppress)
{
- comp = _defaultsAndOverwrites->overwriteCompressValue;
+ comp = _defaultsAndOverrides->overrideComppressValue;
}
}
@@ -796,7 +796,7 @@ IceInternal::Connection::Connection(const InstancePtr& instance,
_adapter(adapter),
_logger(_instance->logger()),
_traceLevels(_instance->traceLevels()),
- _defaultsAndOverwrites(_instance->defaultsAndOverwrites()),
+ _defaultsAndOverrides(_instance->defaultsAndOverrides()),
_nextRequestId(1),
_requestsHint(_requests.end()),
_batchStream(_instance),
diff --git a/cpp/src/Ice/Connection.h b/cpp/src/Ice/Connection.h
index 7ab305c5f5b..ffa47bafc89 100644
--- a/cpp/src/Ice/Connection.h
+++ b/cpp/src/Ice/Connection.h
@@ -22,7 +22,7 @@
#include <Ice/ThreadPoolF.h>
#include <Ice/LoggerF.h>
#include <Ice/TraceLevelsF.h>
-#include <Ice/DefaultsAndOverwritesF.h>
+#include <Ice/DefaultsAndOverridesF.h>
#include <Ice/EventHandler.h>
namespace Ice
@@ -101,7 +101,7 @@ private:
::Ice::ObjectAdapterPtr _adapter;
::Ice::LoggerPtr _logger;
TraceLevelsPtr _traceLevels;
- DefaultsAndOverwritesPtr _defaultsAndOverwrites;
+ DefaultsAndOverridesPtr _defaultsAndOverrides;
ThreadPoolPtr _clientThreadPool;
ThreadPoolPtr _serverThreadPool;
::Ice::Int _nextRequestId;
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 2c8a07ba7a9..bcf4844848f 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -13,7 +13,7 @@
#include <Ice/Instance.h>
#include <Ice/LoggerUtil.h>
#include <Ice/TraceLevels.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
#include <Ice/Properties.h>
#include <Ice/Transceiver.h>
#include <Ice/Connector.h>
@@ -67,14 +67,14 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpoi
//
// Search for existing connections.
//
- DefaultsAndOverwritesPtr defaultsAndOverwrites = _instance->defaultsAndOverwrites();
+ DefaultsAndOverridesPtr defaultsAndOverrides = _instance->defaultsAndOverrides();
vector<EndpointPtr>::const_iterator q;
for (q = endpoints.begin(); q != endpoints.end(); ++q)
{
EndpointPtr endpoint = *q;
- if (defaultsAndOverwrites->overwriteTimeout)
+ if (defaultsAndOverrides->overrideTimeout)
{
- endpoint = endpoint->timeout(defaultsAndOverwrites->overwriteTimeoutValue);
+ endpoint = endpoint->timeout(defaultsAndOverrides->overrideTimeoutValue);
}
map<EndpointPtr, ConnectionPtr>::const_iterator r = _connections.find(endpoint);
@@ -96,9 +96,9 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpoi
while (q != endpoints.end())
{
EndpointPtr endpoint = *q;
- if (defaultsAndOverwrites->overwriteTimeout)
+ if (defaultsAndOverrides->overrideTimeout)
{
- endpoint = endpoint->timeout(defaultsAndOverwrites->overwriteTimeoutValue);
+ endpoint = endpoint->timeout(defaultsAndOverrides->overrideTimeoutValue);
}
try
@@ -177,14 +177,14 @@ IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
//
ObjectPrx proxy = routerInfo->getClientProxy();
ObjectAdapterPtr adapter = routerInfo->getAdapter();
- DefaultsAndOverwritesPtr defaultsAndOverwrites = _instance->defaultsAndOverwrites();
+ DefaultsAndOverridesPtr defaultsAndOverrides = _instance->defaultsAndOverrides();
vector<EndpointPtr>::const_iterator p;
for (p = proxy->__reference()->endpoints.begin(); p != proxy->__reference()->endpoints.end(); ++p)
{
EndpointPtr endpoint = *p;
- if (defaultsAndOverwrites->overwriteTimeout)
+ if (defaultsAndOverrides->overrideTimeout)
{
- endpoint = endpoint->timeout(defaultsAndOverwrites->overwriteTimeoutValue);
+ endpoint = endpoint->timeout(defaultsAndOverrides->overrideTimeoutValue);
}
map<EndpointPtr, ConnectionPtr>::const_iterator q = _connections.find(endpoint);
@@ -430,10 +430,10 @@ IceInternal::IncomingConnectionFactory::IncomingConnectionFactory(const Instance
_adapter(adapter),
_state(StateHolding)
{
- DefaultsAndOverwritesPtr defaultsAndOverwrites = _instance->defaultsAndOverwrites();
- if (defaultsAndOverwrites->overwriteTimeout)
+ DefaultsAndOverridesPtr defaultsAndOverrides = _instance->defaultsAndOverrides();
+ if (defaultsAndOverrides->overrideTimeout)
{
- _endpoint = _endpoint->timeout(defaultsAndOverwrites->overwriteTimeoutValue);
+ _endpoint = _endpoint->timeout(defaultsAndOverrides->overrideTimeoutValue);
}
_warn = _instance->properties()->getPropertyAsInt("Ice.ConnectionWarnings") > 0;
diff --git a/cpp/src/Ice/DefaultsAndOverwrites.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index d757af2eb17..66ffa96bab0 100644
--- a/cpp/src/Ice/DefaultsAndOverwrites.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -8,7 +8,7 @@
//
// **********************************************************************
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
#include <Ice/Properties.h>
#include <Ice/Network.h>
@@ -16,14 +16,14 @@ using namespace std;
using namespace Ice;
using namespace IceInternal;
-void IceInternal::incRef(DefaultsAndOverwrites* p) { p->__incRef(); }
-void IceInternal::decRef(DefaultsAndOverwrites* p) { p->__decRef(); }
+void IceInternal::incRef(DefaultsAndOverrides* p) { p->__incRef(); }
+void IceInternal::decRef(DefaultsAndOverrides* p) { p->__decRef(); }
-IceInternal::DefaultsAndOverwrites::DefaultsAndOverwrites(const PropertiesPtr& properties) :
- overwriteTimeout(false),
- overwriteTimeoutValue(-1),
- overwriteCompress(false),
- overwriteCompressValue(false)
+IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& properties) :
+ overrideTimeout(false),
+ overrideTimeoutValue(-1),
+ overrideComppress(false),
+ overrideComppressValue(false)
{
const_cast<string&>(defaultProtocol) = properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
@@ -37,17 +37,17 @@ IceInternal::DefaultsAndOverwrites::DefaultsAndOverwrites(const PropertiesPtr& p
string value;
- value = properties->getProperty("Ice.Overwrite.Timeout");
+ value = properties->getProperty("Ice.Override.Timeout");
if (!value.empty())
{
- const_cast<bool&>(overwriteTimeout) = true;
- const_cast<Int&>(overwriteTimeoutValue) = atoi(value.c_str());
+ const_cast<bool&>(overrideTimeout) = true;
+ const_cast<Int&>(overrideTimeoutValue) = atoi(value.c_str());
}
- value = properties->getProperty("Ice.Overwrite.Compress");
+ value = properties->getProperty("Ice.Override.Compress");
if (!value.empty())
{
- const_cast<bool&>(overwriteCompress) = true;
- const_cast<bool&>(overwriteCompressValue) = atoi(value.c_str());
+ const_cast<bool&>(overrideComppress) = true;
+ const_cast<bool&>(overrideComppressValue) = atoi(value.c_str());
}
}
diff --git a/cpp/src/Ice/DefaultsAndOverwrites.h b/cpp/src/Ice/DefaultsAndOverrides.h
index 99c5a0e297b..911b16da870 100644
--- a/cpp/src/Ice/DefaultsAndOverwrites.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -8,30 +8,30 @@
//
// **********************************************************************
-#ifndef ICE_ICE_DEFAULTS_AND_OVERWRITES_F_H
-#define ICE_ICE_DEFAULTS_AND_OVERWRITES_F_H
+#ifndef ICE_ICE_DEFAULTS_AND_OVERRIDES_F_H
+#define ICE_ICE_DEFAULTS_AND_OVERRIDES_F_H
#include <IceUtil/Shared.h>
-#include <Ice/DefaultsAndOverwritesF.h>
+#include <Ice/DefaultsAndOverridesF.h>
#include <Ice/PropertiesF.h>
namespace IceInternal
{
-class DefaultsAndOverwrites : public ::IceUtil::Shared
+class DefaultsAndOverrides : public ::IceUtil::Shared
{
public:
- DefaultsAndOverwrites(const ::Ice::PropertiesPtr&);
+ DefaultsAndOverrides(const ::Ice::PropertiesPtr&);
std::string defaultHost;
std::string defaultProtocol;
std::string defaultRouter;
- bool overwriteTimeout;
- Ice::Int overwriteTimeoutValue;
- bool overwriteCompress;
- bool overwriteCompressValue;
+ bool overrideTimeout;
+ Ice::Int overrideTimeoutValue;
+ bool overrideComppress;
+ bool overrideComppressValue;
};
}
diff --git a/cpp/src/Ice/DefaultsAndOverwritesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h
index 9c3cf35a152..0772a93ee72 100644
--- a/cpp/src/Ice/DefaultsAndOverwritesF.h
+++ b/cpp/src/Ice/DefaultsAndOverridesF.h
@@ -8,18 +8,18 @@
//
// **********************************************************************
-#ifndef ICE_DEFAULTS_AND_OVERWRITES_F_H
-#define ICE_DEFAULTS_AND_OVERWRITES_F_H
+#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
+#define ICE_DEFAULTS_AND_OVERRIDES_F_H
#include <Ice/Handle.h>
namespace IceInternal
{
-class DefaultsAndOverwrites;
-void incRef(DefaultsAndOverwrites*);
-void decRef(DefaultsAndOverwrites*);
-typedef Handle<DefaultsAndOverwrites> DefaultsAndOverwritesPtr;
+class DefaultsAndOverrides;
+void incRef(DefaultsAndOverrides*);
+void decRef(DefaultsAndOverrides*);
+typedef Handle<DefaultsAndOverrides> DefaultsAndOverridesPtr;
}
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index 67084de0056..d8f3cc93a07 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -14,7 +14,7 @@
#include <Ice/BasicStream.h>
#include <Ice/LocalException.h>
#include <Ice/Instance.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
using namespace std;
using namespace Ice;
@@ -87,7 +87,7 @@ IceInternal::EndpointFactoryManager::create(const string& str) const
if (protocol == "default")
{
- protocol = _instance->defaultsAndOverwrites()->defaultProtocol;
+ protocol = _instance->defaultsAndOverrides()->defaultProtocol;
}
//
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 4750b0b2999..e1c87922d90 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -10,7 +10,7 @@
#include <Ice/Instance.h>
#include <Ice/TraceLevels.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
#include <Ice/RouterInfo.h>
#include <Ice/ReferenceFactory.h>
#include <Ice/ProxyFactory.h>
@@ -107,11 +107,11 @@ IceInternal::Instance::traceLevels()
return _traceLevels;
}
-DefaultsAndOverwritesPtr
-IceInternal::Instance::defaultsAndOverwrites()
+DefaultsAndOverridesPtr
+IceInternal::Instance::defaultsAndOverrides()
{
// No mutex lock, immutable.
- return _defaultsAndOverwrites;
+ return _defaultsAndOverrides;
}
RouterManagerPtr
@@ -304,7 +304,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc,
_traceLevels = new TraceLevels(_properties);
- _defaultsAndOverwrites = new DefaultsAndOverwrites(_properties);
+ _defaultsAndOverrides = new DefaultsAndOverrides(_properties);
_routerManager = new RouterManager;
@@ -320,10 +320,10 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc,
_pluginManager = new PluginManagerI(this);
- if (!_defaultsAndOverwrites->defaultRouter.empty())
+ if (!_defaultsAndOverrides->defaultRouter.empty())
{
_referenceFactory->setDefaultRouter(
- RouterPrx::uncheckedCast(_proxyFactory->stringToProxy(_defaultsAndOverwrites->defaultRouter)));
+ RouterPrx::uncheckedCast(_proxyFactory->stringToProxy(_defaultsAndOverrides->defaultRouter)));
}
_outgoingConnectionFactory = new OutgoingConnectionFactory(this);
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index f6b37cc8e0b..7cc4ec3ff0b 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -19,7 +19,7 @@
#include <Ice/PropertiesF.h>
#include <Ice/LoggerF.h>
#include <Ice/TraceLevelsF.h>
-#include <Ice/DefaultsAndOverwritesF.h>
+#include <Ice/DefaultsAndOverridesF.h>
#include <Ice/RouterInfoF.h>
#include <Ice/ReferenceFactoryF.h>
#include <Ice/ProxyFactoryF.h>
@@ -51,7 +51,7 @@ public:
::Ice::LoggerPtr logger();
void logger(const ::Ice::LoggerPtr&);
TraceLevelsPtr traceLevels();
- DefaultsAndOverwritesPtr defaultsAndOverwrites();
+ DefaultsAndOverridesPtr defaultsAndOverrides();
RouterManagerPtr routerManager();
ReferenceFactoryPtr referenceFactory();
ProxyFactoryPtr proxyFactory();
@@ -76,7 +76,7 @@ private:
::Ice::PropertiesPtr _properties; // Immutable, not reset by destroy().
::Ice::LoggerPtr _logger; // Not reset by destroy().
TraceLevelsPtr _traceLevels; // Immutable, not reset by destroy().
- DefaultsAndOverwritesPtr _defaultsAndOverwrites; // Immutable, not reset by destroy().
+ DefaultsAndOverridesPtr _defaultsAndOverrides; // Immutable, not reset by destroy().
RouterManagerPtr _routerManager;
ReferenceFactoryPtr _referenceFactory;
ProxyFactoryPtr _proxyFactory;
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 0d83e41a672..7ada271cf6d 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -31,7 +31,7 @@ OBJS = Initialize.o \
Stream.o \
BuiltinSequences.o \
BasicStream.o \
- DefaultsAndOverwrites.o \
+ DefaultsAndOverrides.o \
TraceLevels.o \
TraceUtil.o \
Instance.o \
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index 857a8b80900..6542a0be844 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -13,7 +13,7 @@
#include <Ice/EndpointFactoryManager.h>
#include <Ice/TraceLevels.h>
#include <Ice/Initialize.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
using namespace std;
using namespace Ice;
@@ -42,7 +42,7 @@ IceInternal::ProtocolPluginFacade::getCommunicator() const
string
IceInternal::ProtocolPluginFacade::getDefaultHost() const
{
- return _instance->defaultsAndOverwrites()->defaultHost;
+ return _instance->defaultsAndOverrides()->defaultHost;
}
int
diff --git a/cpp/src/Ice/TcpEndpoint.cpp b/cpp/src/Ice/TcpEndpoint.cpp
index 55a9459e071..8f2a21b8b32 100644
--- a/cpp/src/Ice/TcpEndpoint.cpp
+++ b/cpp/src/Ice/TcpEndpoint.cpp
@@ -16,7 +16,7 @@
#include <Ice/BasicStream.h>
#include <Ice/LocalException.h>
#include <Ice/Instance.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
using namespace std;
using namespace Ice;
@@ -114,7 +114,7 @@ IceInternal::TcpEndpoint::TcpEndpoint(const InstancePtr& instance, const string&
if (_host.empty())
{
- const_cast<string&>(_host) = _instance->defaultsAndOverwrites()->defaultHost;
+ const_cast<string&>(_host) = _instance->defaultsAndOverrides()->defaultHost;
}
}
diff --git a/cpp/src/Ice/UdpEndpoint.cpp b/cpp/src/Ice/UdpEndpoint.cpp
index 66f8a8b89d9..62c84ff7aca 100644
--- a/cpp/src/Ice/UdpEndpoint.cpp
+++ b/cpp/src/Ice/UdpEndpoint.cpp
@@ -14,7 +14,7 @@
#include <Ice/BasicStream.h>
#include <Ice/LocalException.h>
#include <Ice/Instance.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
using namespace std;
using namespace Ice;
@@ -112,7 +112,7 @@ IceInternal::UdpEndpoint::UdpEndpoint(const InstancePtr& instance, const string&
if (_host.empty())
{
- const_cast<string&>(_host) = _instance->defaultsAndOverwrites()->defaultHost;
+ const_cast<string&>(_host) = _instance->defaultsAndOverrides()->defaultHost;
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:05:00 +0000