summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/StreamHelpers.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-01-04 10:50:28 +0100
committerBenoit Foucher <benoit@zeroc.com>2013-01-04 10:50:28 +0100
commit8b4674dbca704b9ffb48cd9a4fee43211e774cce (patch)
treeac55936ef4ba7b52ed8835c011b7c59cf2d1d3ee /cpp/include/Ice/StreamHelpers.h
parentFixed(ICE-5147) - Fix python scripts to not raise strings anymore (diff)
downloadice-8b4674dbca704b9ffb48cd9a4fee43211e774cce.tar.bz2
ice-8b4674dbca704b9ffb48cd9a4fee43211e774cce.tar.xz
ice-8b4674dbca704b9ffb48cd9a4fee43211e774cce.zip
ICE-4938: Super compact enoding
Diffstat (limited to 'cpp/include/Ice/StreamHelpers.h')
-rw-r--r--cpp/include/Ice/StreamHelpers.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
index 81d30f4d543..ef6b8bf6510 100644
--- a/cpp/include/Ice/StreamHelpers.h
+++ b/cpp/include/Ice/StreamHelpers.h
@@ -51,10 +51,10 @@ enum OptionalFormat
OptionalFormatF4 = 2, // Fixed 4 bytes encoding
OptionalFormatF8 = 3, // Fixed 8 bytes encoding
OptionalFormatSize = 4, // "Size encoding" on 1 to 5 bytes, e.g. enum, class identifier
- OptionalFormatVSize = 5, // "Size encoding" on 1 to 5 bytes followed by data, e.g. string, fixed size struct,
- // or containers whose size can be computed prior to marshaling
+ OptionalFormatVSize = 5, // "Size encoding" on 1 to 5 bytes followed by data, e.g. string, fixed size
+ // struct, or containers whose size can be computed prior to marshaling
OptionalFormatFSize = 6, // Fixed size on 4 bytes followed by data, e.g. variable-size struct, container.
- OptionalFormatEndMarker = 7
+ OptionalFormatClass = 7
};
@@ -566,7 +566,7 @@ struct GetOptionalFormat<StreamHelperCategoryBuiltin, 1, false>
template<>
struct GetOptionalFormat<StreamHelperCategoryClass, 1, false>
{
- static const OptionalFormat value = OptionalFormatSize;
+ static const OptionalFormat value = OptionalFormatClass;
};
template<int minWireSize>