diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2016-07-13 13:47:51 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2016-07-13 13:48:40 -0700 |
| commit | 9086d9643903c608ab015b0b7d903547a4e7b6f3 (patch) | |
| tree | b47053ab6f6bde20b55c4fff4019c68a7c45545c /src/google/protobuf/generated_message_util.h | |
| parent | 70c1ac756d3cd8fa04725f82f0ad1a30404c3bb3 (diff) | |
Integrate from internal code base.
Diffstat (limited to 'src/google/protobuf/generated_message_util.h')
| -rw-r--r-- | src/google/protobuf/generated_message_util.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/google/protobuf/generated_message_util.h b/src/google/protobuf/generated_message_util.h index 56f5afd2..dc815189 100644 --- a/src/google/protobuf/generated_message_util.h +++ b/src/google/protobuf/generated_message_util.h @@ -41,8 +41,8 @@ #include <assert.h> #include <string> -#include <google/protobuf/stubs/once.h> #include <google/protobuf/stubs/common.h> +#include <google/protobuf/stubs/once.h> namespace google { @@ -115,6 +115,10 @@ class ArenaString; ArenaString* ReadArenaString(::google::protobuf::io::CodedInputStream* input, ::google::protobuf::Arena* arena); +// Helper function to crash on merge failure. +// Moved out of generated code to reduce binary size. +void MergeFromFail(const char* file, int line) GOOGLE_ATTRIBUTE_NORETURN; + } // namespace internal } // namespace protobuf |