diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-18 14:33:16 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-18 14:33:16 +0200 |
| commit | 2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc (patch) | |
| tree | 0a381f9b284eb7ca5acc9bca5a97659d19874f9d /cpp/src/Ice/DefaultsAndOverrides.cpp | |
| parent | ICE-4828 - Buffer.h undeclared ptrdiff_t issue on OpenSUSE (diff) | |
| download | ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.bz2 ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.xz ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.zip | |
Added support for encoding versioning
Diffstat (limited to 'cpp/src/Ice/DefaultsAndOverrides.cpp')
| -rw-r--r-- | cpp/src/Ice/DefaultsAndOverrides.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp index 8ea1806156b..fc74b714316 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -95,4 +95,8 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro const_cast<bool&>(defaultPreferSecure) = properties->getPropertyAsIntWithDefault("Ice.Default.PreferSecure", 0) > 0; + + value = properties->getPropertyWithDefault("Ice.Default.EncodingVersion", encodingVersionToString(currentEncoding)); + defaultEncoding = stringToEncodingVersion(value); + checkSupportedEncoding(defaultEncoding); } |