diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-10-18 12:22:18 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-10-18 12:22:18 -0700 |
| commit | 1a7a7fca804afa1cf67f8be5e71092898ba40334 (patch) | |
| tree | 04b3da27c71c607510f34a12cf7856a1b94181ae /src/google/protobuf/message_unittest.cc | |
| parent | c4f59dcc5c13debc572154c8f636b8a9361aacde (diff) | |
Merge from google internal
Diffstat (limited to 'src/google/protobuf/message_unittest.cc')
| -rw-r--r-- | src/google/protobuf/message_unittest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/message_unittest.cc b/src/google/protobuf/message_unittest.cc index 86c43774..d328f9dd 100644 --- a/src/google/protobuf/message_unittest.cc +++ b/src/google/protobuf/message_unittest.cc @@ -409,6 +409,7 @@ TEST(MessageTest, MessageIsStillValidAfterParseFails) { } } + namespace { void ExpectMessageMerged(const unittest::TestAllTypes& message) { |