diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-06-03 19:32:20 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-06-03 19:32:20 -0700 |
| commit | 3d649bed4328992f41f567136025f58a019a5159 (patch) | |
| tree | 470be901fbbfe5c6cd4269884412b0d36b48dc92 /cppe/src/IceE/DefaultsAndOverrides.cpp | |
| parent | local interface fixes for slice2javae (diff) | |
| download | ice-3d649bed4328992f41f567136025f58a019a5159.tar.bz2 ice-3d649bed4328992f41f567136025f58a019a5159.tar.xz ice-3d649bed4328992f41f567136025f58a019a5159.zip | |
Various Ice-E fixes:
- Bug fix in slice2javae for local interfaces/classes
- Added Ice.LocalObjectHolder
- Reviewed Java/C++ demos and aligned with Ice
- Source code clean up (removed tabs, etc.)
Diffstat (limited to 'cppe/src/IceE/DefaultsAndOverrides.cpp')
| -rw-r--r-- | cppe/src/IceE/DefaultsAndOverrides.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cppe/src/IceE/DefaultsAndOverrides.cpp b/cppe/src/IceE/DefaultsAndOverrides.cpp index 1f1a2e6f75c..7b47da40d5c 100644 --- a/cppe/src/IceE/DefaultsAndOverrides.cpp +++ b/cppe/src/IceE/DefaultsAndOverrides.cpp @@ -34,15 +34,15 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro value = properties->getProperty("Ice.Override.Timeout"); if(!value.empty()) { - const_cast<bool&>(overrideTimeout) = true; - const_cast<Int&>(overrideTimeoutValue) = properties->getPropertyAsInt("Ice.Override.Timeout"); + const_cast<bool&>(overrideTimeout) = true; + const_cast<Int&>(overrideTimeoutValue) = properties->getPropertyAsInt("Ice.Override.Timeout"); } value = properties->getProperty("Ice.Override.ConnectTimeout"); if(!value.empty()) { - const_cast<bool&>(overrideConnectTimeout) = true; - const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("Ice.Override.ConnectTimeout"); + const_cast<bool&>(overrideConnectTimeout) = true; + const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("Ice.Override.ConnectTimeout"); } #ifdef ICEE_HAS_LOCATOR |