diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-06-28 19:20:18 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-06-28 19:20:18 +0000 |
| commit | 75ac12c02d537f38b03567e406cbeccf29226fe0 (patch) | |
| tree | 4add4682e2aa8edd9c58f1a23ad3f0ccc8336d02 /cpp/src/Ice/DefaultsAndOverrides.cpp | |
| parent | Replaced invalid struct name Struct with Structure. (diff) | |
| download | ice-75ac12c02d537f38b03567e406cbeccf29226fe0.tar.bz2 ice-75ac12c02d537f38b03567e406cbeccf29226fe0.tar.xz ice-75ac12c02d537f38b03567e406cbeccf29226fe0.zip | |
Merged location branch.
Diffstat (limited to 'cpp/src/Ice/DefaultsAndOverrides.cpp')
| -rw-r--r-- | cpp/src/Ice/DefaultsAndOverrides.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp index f04d9f2cb87..31f3972ea6f 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -50,4 +50,6 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro const_cast<bool&>(overrideComppress) = true; const_cast<bool&>(overrideComppressValue) = atoi(value.c_str()); } + + const_cast<string&>(defaultLocator) = properties->getProperty("Ice.Default.Locator"); } |