diff options
Diffstat (limited to 'src/google/protobuf/descriptor_database_unittest.cc')
| -rw-r--r-- | src/google/protobuf/descriptor_database_unittest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/google/protobuf/descriptor_database_unittest.cc b/src/google/protobuf/descriptor_database_unittest.cc index 9d710886..083ef8f2 100644 --- a/src/google/protobuf/descriptor_database_unittest.cc +++ b/src/google/protobuf/descriptor_database_unittest.cc @@ -36,13 +36,10 @@ #include <algorithm> #include <memory> -#ifndef _SHARED_PTR_H -#include <google/protobuf/stubs/shared_ptr.h> -#endif -#include <google/protobuf/descriptor_database.h> -#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.pb.h> +#include <google/protobuf/descriptor.h> +#include <google/protobuf/descriptor_database.h> #include <google/protobuf/text_format.h> #include <google/protobuf/stubs/logging.h> @@ -179,7 +176,7 @@ class DescriptorDatabaseTest EXPECT_FALSE(test_case_->AddToDatabase(file_proto)); } - google::protobuf::scoped_ptr<DescriptorDatabaseTestCase> test_case_; + std::unique_ptr<DescriptorDatabaseTestCase> test_case_; DescriptorDatabase* database_; }; |