diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-05-08 18:14:39 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-05-08 18:14:39 -0700 |
| commit | 7774bb92669779fd165a0510a360fdaecd69f0c3 (patch) | |
| tree | 8ea8bba6cac4128cd3e511ff21534db130ff8e49 /cpp/src/Ice/DefaultsAndOverrides.cpp | |
| parent | Fixed ICE-4709, batch requests and UnmarshalOutOfBoundsException (diff) | |
| download | ice-7774bb92669779fd165a0510a360fdaecd69f0c3.tar.bz2 ice-7774bb92669779fd165a0510a360fdaecd69f0c3.tar.xz ice-7774bb92669779fd165a0510a360fdaecd69f0c3.zip | |
* C++ implementation for compact/sliced formats
* C++ implementation for "preserve-slice" metadata
* C++ tests for compact/sliced/preserved types
* Updated stream API
* Python changes for stream API
* Python tests for compact/sliced formats
* Added Ice.Default.SlicedFormat property
Diffstat (limited to 'cpp/src/Ice/DefaultsAndOverrides.cpp')
| -rw-r--r-- | cpp/src/Ice/DefaultsAndOverrides.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp index 5a6a2a1a589..43e654463f8 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -99,4 +99,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro value = properties->getPropertyWithDefault("Ice.Default.EncodingVersion", encodingVersionToString(currentEncoding)); defaultEncoding = stringToEncodingVersion(value); checkSupportedEncoding(defaultEncoding); + + bool slicedFormat = properties->getPropertyAsIntWithDefault("Ice.Default.SlicedFormat", 0) > 0; + const_cast<FormatType&>(defaultFormat) = slicedFormat ? SlicedFormat : CompactFormat; } |