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.h | |
| 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.h')
| -rw-r--r-- | src/google/protobuf/io/zero_copy_stream.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/io/zero_copy_stream.h b/src/google/protobuf/io/zero_copy_stream.h index 52650fc6..62ace7ae 100644 --- a/src/google/protobuf/io/zero_copy_stream.h +++ b/src/google/protobuf/io/zero_copy_stream.h @@ -123,8 +123,8 @@ class ZeroCopyOutputStream; // copying. class LIBPROTOBUF_EXPORT ZeroCopyInputStream { public: - inline ZeroCopyInputStream() {} - virtual ~ZeroCopyInputStream(); + ZeroCopyInputStream() {} + virtual ~ZeroCopyInputStream() {} // Obtains a chunk of data from the stream. // @@ -180,8 +180,8 @@ class LIBPROTOBUF_EXPORT ZeroCopyInputStream { // copying. class LIBPROTOBUF_EXPORT ZeroCopyOutputStream { public: - inline ZeroCopyOutputStream() {} - virtual ~ZeroCopyOutputStream(); + ZeroCopyOutputStream() {} + virtual ~ZeroCopyOutputStream() {} // Obtains a buffer into which data can be written. Any data written // into this buffer will eventually (maybe instantly, maybe later on) |