diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2016-07-13 13:47:51 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2016-07-13 13:48:40 -0700 |
| commit | 9086d9643903c608ab015b0b7d903547a4e7b6f3 (patch) | |
| tree | b47053ab6f6bde20b55c4fff4019c68a7c45545c /src/google/protobuf/io/coded_stream.cc | |
| parent | 70c1ac756d3cd8fa04725f82f0ad1a30404c3bb3 (diff) | |
Integrate from internal code base.
Diffstat (limited to 'src/google/protobuf/io/coded_stream.cc')
| -rw-r--r-- | src/google/protobuf/io/coded_stream.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/google/protobuf/io/coded_stream.cc b/src/google/protobuf/io/coded_stream.cc index 148eee0e..a5675e79 100644 --- a/src/google/protobuf/io/coded_stream.cc +++ b/src/google/protobuf/io/coded_stream.cc @@ -649,13 +649,16 @@ bool CodedInputStream::Refresh() { // CodedOutputStream ================================================= +bool CodedOutputStream::default_serialization_deterministic_ = false; + CodedOutputStream::CodedOutputStream(ZeroCopyOutputStream* output) : output_(output), buffer_(NULL), buffer_size_(0), total_bytes_(0), had_error_(false), - aliasing_enabled_(false) { + aliasing_enabled_(false), + serialization_deterministic_is_overridden_(false) { // Eagerly Refresh() so buffer space is immediately available. Refresh(); // The Refresh() may have failed. If the client doesn't write any data, @@ -671,7 +674,8 @@ CodedOutputStream::CodedOutputStream(ZeroCopyOutputStream* output, buffer_size_(0), total_bytes_(0), had_error_(false), - aliasing_enabled_(false) { + aliasing_enabled_(false), + serialization_deterministic_is_overridden_(false) { if (do_eager_refresh) { // Eagerly Refresh() so buffer space is immediately available. Refresh(); |