diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 14:24:28 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 14:24:28 -0800 |
| commit | faf581d20866ad5e586b3e515f6c547d2dcec2c1 (patch) | |
| tree | b050fe310f45756de0e4eeb120629581ecaa7455 /src/google/protobuf/wire_format_lite.cc | |
| parent | 643d09ac7dcbf3b014a8a0465ebc4405ac8388b7 (diff) | |
| parent | af88ccb5fc6fcb1a4d6654cc3085cf269b646a96 (diff) | |
Merge pull request #69 from apaprocki/aix-atomicops
Add AIX/POWER atomicops and fix compilation with IBM xlC C++ compiler.
Diffstat (limited to 'src/google/protobuf/wire_format_lite.cc')
| -rw-r--r-- | src/google/protobuf/wire_format_lite.cc | 9 |
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 c80a7050..0c784e66 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] = { |