Merge from Google internal for 3.4 release

1 files changed, 0 insertions, 7 deletions

diff --git a/src/google/protobuf/io/zero_copy_stream_impl.cc b/src/google/protobuf/io/zero_copy_stream_impl.cc
index 109c55c1..d638ec05 100644
--- a/src/google/protobuf/io/zero_copy_stream_impl.cc
+++ b/src/google/protobuf/io/zero_copy_stream_impl.cc
@@ -81,8 +81,6 @@ FileInputStream::FileInputStream(int file_descriptor, int block_size)
     impl_(&copying_input_, block_size) {
 }
 
-FileInputStream::~FileInputStream() {}
-
 bool FileInputStream::Close() {
   return copying_input_.Close();
 }
@@ -273,8 +271,6 @@ bool FileOutputStream::CopyingFileOutputStream::Write(
 IstreamInputStream::IstreamInputStream(std::istream* input, int block_size)
     : copying_input_(input), impl_(&copying_input_, block_size) {}
 
-IstreamInputStream::~IstreamInputStream() {}
-
 bool IstreamInputStream::Next(const void** data, int* size) {
   return impl_.Next(data, size);
 }
@@ -348,9 +344,6 @@ ConcatenatingInputStream::ConcatenatingInputStream(
   : streams_(streams), stream_count_(count), bytes_retired_(0) {
 }
 
-ConcatenatingInputStream::~ConcatenatingInputStream() {
-}
-
 bool ConcatenatingInputStream::Next(const void** data, int* size) {
   while (stream_count_ > 0) {
     if (streams_[0]->Next(data, size)) return true;