diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 15:38:30 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 15:38:30 -0700 |
| commit | 09354db1434859a31a3c81abebcc4018d42f2715 (patch) | |
| tree | b87c7cdc2255e6c8062ab92b4082665cd698d753 /src/google/protobuf/io/zero_copy_stream.cc | |
| parent | 9053033a5076f82cf18b823c31f352e95e5bfd8d (diff) | |
| download | protobuf-09354db1434859a31a3c81abebcc4018d42f2715.tar.gz protobuf-09354db1434859a31a3c81abebcc4018d42f2715.tar.bz2 protobuf-09354db1434859a31a3c81abebcc4018d42f2715.zip | |
Merge from Google internal for 3.4 release
Diffstat (limited to 'src/google/protobuf/io/zero_copy_stream.cc')
| -rw-r--r-- | src/google/protobuf/io/zero_copy_stream.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/google/protobuf/io/zero_copy_stream.cc b/src/google/protobuf/io/zero_copy_stream.cc index 186de001..f81555e5 100644 --- a/src/google/protobuf/io/zero_copy_stream.cc +++ b/src/google/protobuf/io/zero_copy_stream.cc @@ -41,9 +41,6 @@ namespace google { namespace protobuf { namespace io { -ZeroCopyInputStream::~ZeroCopyInputStream() {} -ZeroCopyOutputStream::~ZeroCopyOutputStream() {} - bool ZeroCopyOutputStream::WriteAliasedRaw(const void* /* data */, int /* size */) { |