summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/DefaultsAndOverrides.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-04-18 14:33:16 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-04-18 14:33:16 +0200
commit2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc (patch)
tree0a381f9b284eb7ca5acc9bca5a97659d19874f9d /cpp/src/Ice/DefaultsAndOverrides.h
parentICE-4828 - Buffer.h undeclared ptrdiff_t issue on OpenSUSE (diff)
downloadice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.bz2
ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.xz
ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.zip
Added support for encoding versioning
Diffstat (limited to 'cpp/src/Ice/DefaultsAndOverrides.h')
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h
index 0c6ff23220e..5b2a4d3e30e 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -31,6 +31,7 @@ public:
Ice::EndpointSelectionType defaultEndpointSelection;
int defaultLocatorCacheTimeout;
bool defaultPreferSecure;
+ Ice::EncodingVersion defaultEncoding;
bool overrideTimeout;
Ice::Int overrideTimeoutValue;