diff options
| author |  Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
| commit | 0400cca3236de1ca303af38bf81eab332d042b7c (patch) | |
| tree | a8a9b19853f64567c96750a1c7d253926471daa5 /src/google/protobuf/arena_test_util.h | |
| parent | 96b535cc2f4f7b7e22a1b8622149f7c26a5a3f63 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/arena_test_util.h')
| -rw-r--r-- | src/google/protobuf/arena_test_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/arena_test_util.h b/src/google/protobuf/arena_test_util.h index 8c9f7698..df56ece8 100644 --- a/src/google/protobuf/arena_test_util.h +++ b/src/google/protobuf/arena_test_util.h @@ -50,7 +50,7 @@ void TestParseCorruptedString(const T& message) { s[i] ^= c; google::protobuf::Arena arena; T* message = - google::protobuf::Arena::CreateMessage<T>(use_arena ? &arena : NULL); + google::protobuf::Arena::CreateMessage<T>(use_arena ? &arena : nullptr); if (message->ParseFromString(s)) { ++success_count; } |