From d90737372d370d920e390aff6138dbc2aec2f3b1 Mon Sep 17 00:00:00 2001 From: Jakob Buchgraber Date: Thu, 13 Apr 2017 15:08:11 +0200 Subject: Revert "protobuf: Update protobuf to @laszlocsomor's master at commit 421d909." This reverts commit ea82aa115794b019472b44d4f94ed902c1217f30. --- .../Tests/unittest_extension_chain_d.proto | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto (limited to 'third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto') diff --git a/third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto b/third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto deleted file mode 100644 index f9abe3ba59..0000000000 --- a/third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto +++ /dev/null @@ -1,49 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2016 Google Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto2"; - -package protobuf_unittest; - -import "google/protobuf/unittest.proto"; - -import "unittest_extension_chain_b.proto"; -import "unittest_extension_chain_c.proto"; - -// The root should end up needing to merge B (C will be merged into B, so it -// doesn't need to be directly merged). - -message ChainDMessage { - optional ChainBMessage b = 1; - optional ChainCMessage c = 2; -} - -extend TestAllExtensions { - optional int32 chain_d_extension = 10004; -} -- cgit v1.2.3