| Index: third_party/protobuf/src/google/protobuf/stubs/statusor.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/service.cc b/third_party/protobuf/src/google/protobuf/stubs/statusor.cc
|
| similarity index 82%
|
| copy from third_party/protobuf/src/google/protobuf/service.cc
|
| copy to third_party/protobuf/src/google/protobuf/stubs/statusor.cc
|
| index caf968ca5b4d46115c87a504b6a09d1358356884..48d1402ae0036d7b29e1415923e16d7311afb4a8 100644
|
| --- a/third_party/protobuf/src/google/protobuf/service.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/stubs/statusor.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
|
| @@ -28,19 +28,19 @@
|
| // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| -// Author: kenton@google.com (Kenton Varda)
|
| -// Based on original Protocol Buffers design by
|
| -// Sanjay Ghemawat, Jeff Dean, and others.
|
| -
|
| -#include <google/protobuf/service.h>
|
| +#include <google/protobuf/stubs/statusor.h>
|
|
|
| namespace google {
|
| namespace protobuf {
|
| +namespace util {
|
| +namespace internal {
|
|
|
| -Service::~Service() {}
|
| -RpcChannel::~RpcChannel() {}
|
| -RpcController::~RpcController() {}
|
| +void StatusOrHelper::Crash(const Status& status) {
|
| + GOOGLE_LOG(FATAL) << "Attempting to fetch value instead of handling error "
|
| + << status.ToString();
|
| +}
|
|
|
| +} // namespace internal
|
| +} // namespace util
|
| } // namespace protobuf
|
| -
|
| } // namespace google
|
|
|