diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-12-06 16:36:08 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-12-06 16:36:08 +0000 |
| commit | fda53102d9aa6ef19694e1b8c0b001cd3aae529e (patch) | |
| tree | 149a69163e0d631e826ab5b3cb49e32fe9e39d24 /cpp/src/Ice/DefaultsAndOverrides.cpp | |
| parent | Initial addition (diff) | |
| download | ice-fda53102d9aa6ef19694e1b8c0b001cd3aae529e.tar.bz2 ice-fda53102d9aa6ef19694e1b8c0b001cd3aae529e.tar.xz ice-fda53102d9aa6ef19694e1b8c0b001cd3aae529e.zip | |
amd merge
Diffstat (limited to 'cpp/src/Ice/DefaultsAndOverrides.cpp')
| -rw-r--r-- | cpp/src/Ice/DefaultsAndOverrides.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp index da0c7e6fbe3..68c50cc82f7 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -26,8 +26,8 @@ void IceInternal::decRef(DefaultsAndOverrides* p) { p->__decRef(); } IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& properties) : overrideTimeout(false), overrideTimeoutValue(-1), - overrideComppress(false), - overrideComppressValue(false) + overrideCompress(false), + overrideCompressValue(false) { const_cast<string&>(defaultProtocol) = properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp"); @@ -51,8 +51,8 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro value = properties->getProperty("Ice.Override.Compress"); if(!value.empty()) { - const_cast<bool&>(overrideComppress) = true; - const_cast<bool&>(overrideComppressValue) = properties->getPropertyAsInt("Ice.Override.Compress"); + const_cast<bool&>(overrideCompress) = true; + const_cast<bool&>(overrideCompressValue) = properties->getPropertyAsInt("Ice.Override.Compress"); } const_cast<string&>(defaultLocator) = properties->getProperty("Ice.Default.Locator"); |