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_runner.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 'conformance/conformance_test_runner.cc')
| -rw-r--r-- | conformance/conformance_test_runner.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/conformance/conformance_test_runner.cc b/conformance/conformance_test_runner.cc index 09631f0c..b0357b87 100644 --- a/conformance/conformance_test_runner.cc +++ b/conformance/conformance_test_runner.cc @@ -68,7 +68,6 @@ using conformance::ConformanceRequest; using conformance::ConformanceResponse; -using google::protobuf::internal::scoped_array; using google::protobuf::StringAppendF; using std::string; using std::vector; @@ -183,7 +182,7 @@ class ForkPipeRunner : public google::protobuf::ConformanceTestRunner { CHECK_SYSCALL(close(toproc_pipe_fd[1])); CHECK_SYSCALL(close(fromproc_pipe_fd[0])); - scoped_array<char> executable(new char[executable_.size() + 1]); + std::unique_ptr<char[]> executable(new char[executable_.size() + 1]); memcpy(executable.get(), executable_.c_str(), executable_.size()); executable[executable_.size()] = '\0'; |