From 67952fab2c766ac5eacc15bb78e5af4039a3d398 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Wed, 14 Mar 2018 11:17:48 -0700 Subject: 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. --- conformance/conformance_test_runner.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'conformance/conformance_test_runner.cc') 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 executable(new char[executable_.size() + 1]); + std::unique_ptr executable(new char[executable_.size() + 1]); memcpy(executable.get(), executable_.c_str(), executable_.size()); executable[executable_.size()] = '\0'; -- cgit v1.2.3