diff options
| author | Adam Cozzette <acozzette@google.com> | 2018-03-14 11:17:48 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-03-14 11:17:48 -0700 |
| commit | 67952fab2c766ac5eacc15bb78e5af4039a3d398 (patch) | |
| tree | eaaec1e5a17e676cd08535e15a365d557c332c3b /conformance/conformance_test.h | |
| parent | b1216d95db304326f4c28d6dbc7d0860c43d8208 (diff) | |
| download | protobuf-67952fab2c766ac5eacc15bb78e5af4039a3d398.tar.gz protobuf-67952fab2c766ac5eacc15bb78e5af4039a3d398.tar.bz2 protobuf-67952fab2c766ac5eacc15bb78e5af4039a3d398.zip | |
Deleted scoped_ptr.h
We no longer need this, now that we have finished the switch to C++11
and are using std::unique_ptr.
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_; }; |