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

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

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 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/arena_nc.cc
diff --git a/third_party/protobuf/src/google/protobuf/service.cc b/third_party/protobuf/src/google/protobuf/arena_nc.cc
similarity index 82%
copy from third_party/protobuf/src/google/protobuf/service.cc
copy to third_party/protobuf/src/google/protobuf/arena_nc.cc
index caf968ca5b4d46115c87a504b6a09d1358356884..f2f084274a4e892681cd7867901196e48e8c1301 100644
--- a/third_party/protobuf/src/google/protobuf/service.cc
+++ b/third_party/protobuf/src/google/protobuf/arena_nc.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,18 @@
// (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.
+// Negative compilation test for arena usage.
-#include <google/protobuf/service.h>
+#include <google/protobuf/arena.h>
+#include <google/protobuf/unittest.pb.h>
-namespace google {
-namespace protobuf {
-
-Service::~Service() {}
-RpcChannel::~RpcChannel() {}
-RpcController::~RpcController() {}
+#ifdef TEST_ARENA_PRIVATE_CONSTRUCTOR
-} // namespace protobuf
+namespace google {
+void ArenaPrivateConstructor() {
+ google::protobuf::Arena arena;
+ protobuf_unittest::TestAllTypes message(&arena);
+}
+#endif
} // namespace google
« no previous file with comments | « third_party/protobuf/src/google/protobuf/arena.cc ('k') | third_party/protobuf/src/google/protobuf/arena_nc_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698