| Index: third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc b/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
|
| index dad6ff14468d031f16baafb2f1ca567961251c43..186de00141d54f9566be6c80dc68afa638e14670 100644
|
| --- a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.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
|
| @@ -34,6 +34,8 @@
|
|
|
| #include <google/protobuf/io/zero_copy_stream.h>
|
|
|
| +#include <google/protobuf/stubs/logging.h>
|
| +#include <google/protobuf/stubs/common.h>
|
|
|
| namespace google {
|
| namespace protobuf {
|
| @@ -43,6 +45,14 @@ ZeroCopyInputStream::~ZeroCopyInputStream() {}
|
| ZeroCopyOutputStream::~ZeroCopyOutputStream() {}
|
|
|
|
|
| +bool ZeroCopyOutputStream::WriteAliasedRaw(const void* /* data */,
|
| + int /* size */) {
|
| + GOOGLE_LOG(FATAL) << "This ZeroCopyOutputStream doesn't support aliasing. "
|
| + "Reaching here usually means a ZeroCopyOutputStream "
|
| + "implementation bug.";
|
| + return false;
|
| +}
|
| +
|
| } // namespace io
|
| } // namespace protobuf
|
| } // namespace google
|
|
|