Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Unified Diff: third_party/protobuf/src/google/protobuf/metadata.cc

Issue 1291903002: Pull new version of protobuf sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix attempts Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/src/google/protobuf/metadata.cc
diff --git a/third_party/protobuf/src/google/protobuf/service.cc b/third_party/protobuf/src/google/protobuf/metadata.cc
similarity index 82%
copy from third_party/protobuf/src/google/protobuf/service.cc
copy to third_party/protobuf/src/google/protobuf/metadata.cc
index caf968ca5b4d46115c87a504b6a09d1358356884..99d2cf9021813da6418177838fb99ec59a91ca78 100644
--- a/third_party/protobuf/src/google/protobuf/service.cc
+++ b/third_party/protobuf/src/google/protobuf/metadata.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/
+// Copyright 2015 Google Inc. All rights reserved.
+// 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,15 @@
// (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/metadata.h>
namespace google {
namespace protobuf {
+namespace internal {
-Service::~Service() {}
-RpcChannel::~RpcChannel() {}
-RpcController::~RpcController() {}
+InternalMetadataWithArena::InternalMetadataWithArena(Arena* arena)
+ : ptr_ (arena) {}
+} // namespace internal
} // namespace protobuf
-
} // namespace google

Powered by Google App Engine
This is Rietveld 408576698