diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-10 20:23:41 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-10 20:23:41 +0000 |
| commit | 09b9e99bd388986f74be2eb4238c0cc67f211d93 (patch) | |
| tree | 8531f296aa50d337d1bd1eceabfbc133ce57c7fe /src/google/protobuf/compiler/cpp/cpp_unittest.cc | |
| parent | bcb791a9d0a8574eb6ba414132e99e4c74d91966 (diff) | |
Make tests compile on Sun Studio. Patch from Monty Taylor.
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_unittest.cc')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_unittest.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_unittest.cc b/src/google/protobuf/compiler/cpp/cpp_unittest.cc index 2b16e85d..d7575c05 100644 --- a/src/google/protobuf/compiler/cpp/cpp_unittest.cc +++ b/src/google/protobuf/compiler/cpp/cpp_unittest.cc @@ -451,8 +451,7 @@ TEST(GeneratedMessageTest, SerializationToArray) { int size = message1.ByteSize(); data.resize(size); uint8* start = reinterpret_cast<uint8*>(string_as_array(&data)); - uint8* end = - message1.TestAllTypes::SerializeWithCachedSizesToArray(start); + uint8* end = message1.SerializeWithCachedSizesToArray(start); EXPECT_EQ(size, end - start); EXPECT_TRUE(message2.ParseFromString(data)); TestUtil::ExpectAllFieldsSet(message2); @@ -466,8 +465,7 @@ TEST(GeneratedMessageTest, PackedFieldsSerializationToArray) { int packed_size = packed_message1.ByteSize(); packed_data.resize(packed_size); uint8* start = reinterpret_cast<uint8*>(string_as_array(&packed_data)); - uint8* end = - packed_message1.TestPackedTypes::SerializeWithCachedSizesToArray(start); + uint8* end = packed_message1.SerializeWithCachedSizesToArray(start); EXPECT_EQ(packed_size, end - start); EXPECT_TRUE(packed_message2.ParseFromString(packed_data)); TestUtil::ExpectPackedFieldsSet(packed_message2); @@ -485,7 +483,7 @@ TEST(GeneratedMessageTest, SerializationToStream) { // Allow the output stream to buffer only one byte at a time. io::ArrayOutputStream array_stream(string_as_array(&data), size, 1); io::CodedOutputStream output_stream(&array_stream); - message1.TestAllTypes::SerializeWithCachedSizes(&output_stream); + message1.SerializeWithCachedSizes(&output_stream); EXPECT_FALSE(output_stream.HadError()); EXPECT_EQ(size, output_stream.ByteCount()); } @@ -504,7 +502,7 @@ TEST(GeneratedMessageTest, PackedFieldsSerializationToStream) { // Allow the output stream to buffer only one byte at a time. io::ArrayOutputStream array_stream(string_as_array(&data), size, 1); io::CodedOutputStream output_stream(&array_stream); - message1.TestPackedTypes::SerializeWithCachedSizes(&output_stream); + message1.SerializeWithCachedSizes(&output_stream); EXPECT_FALSE(output_stream.HadError()); EXPECT_EQ(size, output_stream.ByteCount()); } |