diff options
author | Adam Cozzette <acozzette@gmail.com> | 2018-03-20 16:14:32 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-20 16:14:32 -0700 |
commit | ed4321d1cb33199984118d801956822842771e7e (patch) | |
tree | 16c54ef8d5409766c18ccae8fca685230680d620 /conformance/conformance_test.h | |
parent | e436ee0aa179340832281b7d90885e9ff15b3748 (diff) | |
parent | 11d26ce24c90a6cf2544f71e09970513550ef6c6 (diff) |
Merge pull request #4387 from acozzette/down-integrate
Integrated internal changes from Google
Diffstat (limited to 'conformance/conformance_test.h')
-rw-r--r-- | conformance/conformance_test.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h index 4882412c..2649f8b2 100644 --- a/conformance/conformance_test.h +++ b/conformance/conformance_test.h @@ -256,8 +256,7 @@ class ConformanceTestSuite { // The set of tests that the testee opted out of; std::set<std::string> skipped_; - google::protobuf::internal::scoped_ptr<google::protobuf::util::TypeResolver> - type_resolver_; + std::unique_ptr<google::protobuf::util::TypeResolver> type_resolver_; std::string type_url_; }; |