| Index: third_party/protobuf/src/google/protobuf/arena_test_util.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc b/third_party/protobuf/src/google/protobuf/arena_test_util.cc
|
| similarity index 80%
|
| copy from third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
|
| copy to third_party/protobuf/src/google/protobuf/arena_test_util.cc
|
| index dad6ff14468d031f16baafb2f1ca567961251c43..df9c5bd6b488c174f03b62e57b67444c79192184 100644
|
| --- a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/arena_test_util.cc
|
| @@ -1,6 +1,6 @@
|
| // Protocol Buffers - Google's data interchange format
|
| // Copyright 2008 Google Inc. All rights reserved.
|
| -// http://code.google.com/p/protobuf/
|
| +// https://developers.google.com/protocol-buffers/
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| @@ -28,21 +28,23 @@
|
| // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| -// Author: kenton@google.com (Kenton Varda)
|
| -// Based on original Protocol Buffers design by
|
| -// Sanjay Ghemawat, Jeff Dean, and others.
|
| +#include <google/protobuf/stubs/logging.h>
|
| +#include <google/protobuf/stubs/common.h>
|
| +#include <google/protobuf/arena_test_util.h>
|
|
|
| -#include <google/protobuf/io/zero_copy_stream.h>
|
|
|
| +#define EXPECT_EQ GOOGLE_CHECK_EQ
|
|
|
| namespace google {
|
| namespace protobuf {
|
| -namespace io {
|
| +namespace internal {
|
|
|
| -ZeroCopyInputStream::~ZeroCopyInputStream() {}
|
| -ZeroCopyOutputStream::~ZeroCopyOutputStream() {}
|
| +NoHeapChecker::~NoHeapChecker() {
|
| + capture_alloc.Unhook();
|
| + EXPECT_EQ(0, capture_alloc.alloc_count());
|
| + EXPECT_EQ(0, capture_alloc.free_count());
|
| +}
|
|
|
| -
|
| -} // namespace io
|
| +} // namespace internal
|
| } // namespace protobuf
|
| } // namespace google
|
|
|