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.h | |
| 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.h')
| -rw-r--r-- | cpp/src/Ice/DefaultsAndOverrides.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h index b75539f7ff9..d2f624470d1 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.h +++ b/cpp/src/Ice/DefaultsAndOverrides.h @@ -15,6 +15,7 @@ #include <Ice/DefaultsAndOverridesF.h> #include <Ice/PropertiesF.h> #include <Ice/Endpoint.h> +#include <Ice/Format.h> namespace IceInternal { @@ -32,6 +33,7 @@ public: int defaultLocatorCacheTimeout; bool defaultPreferSecure; Ice::EncodingVersion defaultEncoding; + Ice::FormatType defaultFormat; bool overrideTimeout; Ice::Int overrideTimeoutValue; |