| Index: third_party/protobuf/patches/0010-uninline-generated-code.patch
|
| diff --git a/third_party/protobuf/patches/0010-uninline-generated-code.patch b/third_party/protobuf/patches/0010-uninline-generated-code.patch
|
| index 85274dee8dcceb279f5b9164664b43ebeafad7a0..f7df39d650d94dec540c7dec06380b1c4f4775d5 100644
|
| --- a/third_party/protobuf/patches/0010-uninline-generated-code.patch
|
| +++ b/third_party/protobuf/patches/0010-uninline-generated-code.patch
|
| @@ -1,15 +1,16 @@
|
| unchanged:
|
| --- protobuf-cleaned/src/google/protobuf/compiler/cpp/cpp_file.cc 2015-12-30 13:21:46.000000000 -0800
|
| +++ protobuf-patched/src/google/protobuf/compiler/cpp/cpp_file.cc 2016-03-31 13:25:40.252007316 -0700
|
| -@@ -337,7 +337,7 @@
|
| - "namespace {\n"
|
| - "\n"
|
| - "static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;\n"
|
| -- "static void MergeFromFail(int line) {\n"
|
| -+ "GOOGLE_ATTRIBUTE_NOINLINE static void MergeFromFail(int line) {\n"
|
| - " GOOGLE_CHECK(false) << __FILE__ << \":\" << line;\n"
|
| - "}\n"
|
| - "\n"
|
| +@@ -342,8 +342,8 @@
|
| + "namespace {\n"
|
| + "\n"
|
| + "static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD"
|
| + " GOOGLE_ATTRIBUTE_NORETURN;\n"
|
| +- "static void MergeFromFail(int line) {\n"
|
| ++ "GOOGLE_ATTRIBUTE_NOINLINE static void MergeFromFail(int line) {\n"
|
| + " ::google::protobuf::internal::MergeFromFail(__FILE__, line);\n"
|
| + "}\n"
|
| + "\n"
|
| only in patch2:
|
| unchanged:
|
| --- protobuf-cleaned/src/google/protobuf/compiler/cpp/cpp_message.cc 2015-12-30 13:21:46.000000000 -0800
|
|
|