diff options
| -rw-r--r-- | src/google/protobuf/io/coded_stream_unittest.cc | 6 | ||||
| -rw-r--r-- | src/google/protobuf/message.cc | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/google/protobuf/io/coded_stream_unittest.cc b/src/google/protobuf/io/coded_stream_unittest.cc index b39987ca..0cfeb883 100644 --- a/src/google/protobuf/io/coded_stream_unittest.cc +++ b/src/google/protobuf/io/coded_stream_unittest.cc @@ -144,10 +144,6 @@ uint8 CodedStreamTest::buffer_[CodedStreamTest::kBufferSize]; // checks. const int kBlockSizes[] = {1, 2, 3, 5, 7, 13, 32, 1024}; -// In several ReadCord test functions, we either clear the Cord before ReadCord -// calls or not. -const bool kResetCords[] = {false, true}; - // ------------------------------------------------------------------- // Varint tests. @@ -877,8 +873,6 @@ TEST_F(CodedStreamTest, const char kSkipTestBytes[] = "<Before skipping><To be skipped><After skipping>"; -const char kSkipOutputTestBytes[] = - "-----------------<To be skipped>----------------"; TEST_1D(CodedStreamTest, SkipInput, kBlockSizes) { memcpy(buffer_, kSkipTestBytes, sizeof(kSkipTestBytes)); diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index e838d30c..2b9a2cb6 100644 --- a/src/google/protobuf/message.cc +++ b/src/google/protobuf/message.cc @@ -32,6 +32,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. +#include <iostream> #include <stack> #include <google/protobuf/stubs/hash.h> |