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 /conformance/conformance_test.h | |
| 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 '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_; }; |