diff options
author | Josh Gao <jmgao@google.com> | 2016-08-10 18:30:57 -0700 |
---|---|---|
committer | Josh Gao <jmgao@google.com> | 2016-08-10 18:30:57 -0700 |
commit | cb47e738d98662a4a31d0eeeec722ef476d7669d (patch) | |
tree | e18432e1326a2b9563b647555c2367b85f33cb8e /alloc-stress | |
parent | 1cc3b804f980ad43d57f19266c8b1ad890060008 (diff) | |
parent | 3609371c949ec3c31fc88bb6a2231774fdeb25c1 (diff) | |
download | extras-cb47e738d98662a4a31d0eeeec722ef476d7669d.tar.gz |
Merge commit '3609371c949ec3c31fc88bb6a2231774fdeb25c1' into manual_merge_3609371
Change-Id: I6b9c6b1d0281bfefcb8f664cfb0e535ae4c83647
Diffstat (limited to 'alloc-stress')
-rw-r--r-- | alloc-stress/alloc-stress.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/alloc-stress/alloc-stress.cpp b/alloc-stress/alloc-stress.cpp index 726ea966..12eecc5a 100644 --- a/alloc-stress/alloc-stress.cpp +++ b/alloc-stress/alloc-stress.cpp @@ -111,7 +111,7 @@ void createProcess(Pipe pipe, const char *exName, const char *arg) char writeFdStr[16]; snprintf(readFdStr, sizeof(readFdStr), "%d", pipe.getReadFd()); snprintf(writeFdStr, sizeof(writeFdStr), "%d", pipe.getWriteFd()); - execl(exName, exName, "--worker", arg, readFdStr, writeFdStr, 0); + execl(exName, exName, "--worker", arg, readFdStr, writeFdStr, nullptr); ASSERT_TRUE(0); } // parent process |