From 8cc62f781ff4e724f8c2f763487390063fcc79e4 Mon Sep 17 00:00:00 2001 From: Jakob Buchgraber Date: Mon, 9 Jul 2018 16:45:04 +0200 Subject: Revert "Update protobuf to 3.6.0. Fixes #5439" This reverts commit 6fd4e0edd4de22dec9eda13dc0b29214f2ca117e. --- .../Tests/unittest_extension_chain_b.proto | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 third_party/protobuf/3.4.0/objectivec/Tests/unittest_extension_chain_b.proto (limited to 'third_party/protobuf/3.4.0/objectivec/Tests/unittest_extension_chain_b.proto') diff --git a/third_party/protobuf/3.4.0/objectivec/Tests/unittest_extension_chain_b.proto b/third_party/protobuf/3.4.0/objectivec/Tests/unittest_extension_chain_b.proto new file mode 100644 index 0000000000..0da7ed3e4c --- /dev/null +++ b/third_party/protobuf/3.4.0/objectivec/Tests/unittest_extension_chain_b.proto @@ -0,0 +1,47 @@ +// 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_c.proto"; + +// The Root for this file should end up adding the local extension and merging +// in the extensions from C's Root (unittest will come via C's). + +message ChainBMessage { + optional ChainCMessage c = 1; +} + +extend TestAllExtensions { + optional int32 chain_b_extension = 10002; +} -- cgit v1.2.3