diff options
Diffstat (limited to 'conformance/conformance_test_runner.cc')
| -rw-r--r-- | conformance/conformance_test_runner.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/conformance/conformance_test_runner.cc b/conformance/conformance_test_runner.cc index 7e91d388..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'; @@ -264,7 +263,7 @@ void UsageError() { exit(1); } -void ParseFailureList(const char *filename, vector<string>* failure_list) { +void ParseFailureList(const char *filename, std::vector<string>* failure_list) { std::ifstream infile(filename); if (!infile.is_open()) { @@ -291,7 +290,7 @@ int main(int argc, char *argv[]) { google::protobuf::ConformanceTestSuite suite; string failure_list_filename; - vector<string> failure_list; + std::vector<string> failure_list; for (int arg = 1; arg < argc; ++arg) { if (strcmp(argv[arg], "--failure_list") == 0) { |