diff options
| author | stone4774 <25053818+stone4774@users.noreply.github.com> | 2018-03-22 11:16:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 11:16:34 +0800 |
| commit | c99f5278eb8dad6f42def88ce8b5a3453f6df4a8 (patch) | |
| tree | c3cd284ec9d2981f61da266d040935b73275b5c4 /src/google/protobuf/util/internal/default_value_objectwriter_test.cc | |
| parent | d053271deebe0efcd41729991b1f3d618b638ad5 (diff) | |
| parent | ed4321d1cb33199984118d801956822842771e7e (diff) | |
| download | protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.tar.gz protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.tar.bz2 protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.zip | |
Merge branch 'master' into fixbug_enum2json2
Diffstat (limited to 'src/google/protobuf/util/internal/default_value_objectwriter_test.cc')
| -rw-r--r-- | src/google/protobuf/util/internal/default_value_objectwriter_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/util/internal/default_value_objectwriter_test.cc b/src/google/protobuf/util/internal/default_value_objectwriter_test.cc index e1dd697a..0c4af61b 100644 --- a/src/google/protobuf/util/internal/default_value_objectwriter_test.cc +++ b/src/google/protobuf/util/internal/default_value_objectwriter_test.cc @@ -60,7 +60,7 @@ class BaseDefaultValueObjectWriterTest TypeInfoTestHelper helper_; MockObjectWriter mock_; ExpectingObjectWriter expects_; - google::protobuf::scoped_ptr<DefaultValueObjectWriter> testing_; + std::unique_ptr<DefaultValueObjectWriter> testing_; }; // Tests to cover some basic DefaultValueObjectWriter use cases. More tests are @@ -156,7 +156,7 @@ class DefaultValueObjectWriterSuppressListTest : BaseDefaultValueObjectWriterTest(DefaultValueTest::descriptor()) { testing_->set_suppress_empty_list(true); } - ~DefaultValueObjectWriterSuppressListTest() {} + ~DefaultValueObjectWriterSuppressListTest() override {} }; INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest, |