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_runner.cc | |
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_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'; |