aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/wire_format_lite.cc
diff options
context:
space:
mode:
authorGravatar Andrew Paprocki <andrew@ishiboo.com>2014-10-31 15:46:39 -0400
committerGravatar Andrew Paprocki <andrew@ishiboo.com>2014-10-31 16:47:24 -0400
commit4eaa16f7a9016f69900baa14fff8250fdc085bf3 (patch)
treecb6419829877c3ec1afd3206028836a37406098a /src/google/protobuf/wire_format_lite.cc
parent53d202f587f329f84ce11c3ce6f8037ccce73f67 (diff)
Fixed IBM xlC compiler error due to missing prefix.
Diffstat (limited to 'src/google/protobuf/wire_format_lite.cc')
-rw-r--r--src/google/protobuf/wire_format_lite.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/google/protobuf/wire_format_lite.cc b/src/google/protobuf/wire_format_lite.cc
index 8de82784..0b63ff83 100644
--- a/src/google/protobuf/wire_format_lite.cc
+++ b/src/google/protobuf/wire_format_lite.cc
@@ -55,11 +55,12 @@ const int WireFormatLite::kMessageSetMessageTag;
#endif
+// IBM xlC requires prefixing constants with WireFormatLite::
const int WireFormatLite::kMessageSetItemTagsSize =
- io::CodedOutputStream::StaticVarintSize32<kMessageSetItemStartTag>::value +
- io::CodedOutputStream::StaticVarintSize32<kMessageSetItemEndTag>::value +
- io::CodedOutputStream::StaticVarintSize32<kMessageSetTypeIdTag>::value +
- io::CodedOutputStream::StaticVarintSize32<kMessageSetMessageTag>::value;
+ io::CodedOutputStream::StaticVarintSize32<WireFormatLite::kMessageSetItemStartTag>::value +
+ io::CodedOutputStream::StaticVarintSize32<WireFormatLite::kMessageSetItemEndTag>::value +
+ io::CodedOutputStream::StaticVarintSize32<WireFormatLite::kMessageSetTypeIdTag>::value +
+ io::CodedOutputStream::StaticVarintSize32<WireFormatLite::kMessageSetMessageTag>::value;
const WireFormatLite::CppType
WireFormatLite::kFieldTypeToCppTypeMap[MAX_FIELD_TYPE + 1] = {