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/lite_arena_unittest.cc | |
| parent | 96b535cc2f4f7b7e22a1b8622149f7c26a5a3f63 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/lite_arena_unittest.cc')
| -rw-r--r-- | src/google/protobuf/lite_arena_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/google/protobuf/lite_arena_unittest.cc b/src/google/protobuf/lite_arena_unittest.cc index dadaffb6..3e88314d 100644 --- a/src/google/protobuf/lite_arena_unittest.cc +++ b/src/google/protobuf/lite_arena_unittest.cc @@ -30,7 +30,6 @@ #include <google/protobuf/arena_test_util.h> #include <google/protobuf/map_lite_test_util.h> -#include <google/protobuf/testing/googletest.h> #include <gtest/gtest.h> namespace google { @@ -49,7 +48,7 @@ class LiteArenaTest : public testing::Test { google::protobuf::Arena::CreateArray<char>(arena_.get(), 1); } - google::protobuf::scoped_ptr<Arena> arena_; + std::unique_ptr<Arena> arena_; }; TEST_F(LiteArenaTest, MapNoHeapAllocation) { |