diff options
| author | Jan Niklas Hasse <jhasse@bixense.com> | 2020-11-28 11:22:23 (GMT) |
|---|---|---|
| committer | Jan Niklas Hasse <jhasse@bixense.com> | 2020-11-28 11:22:23 (GMT) |
| commit | 9cf70a20685ac3bd48fceac2ea268d449c7e78d5 (patch) | |
| tree | 433402b91ee03f5a476da5c0bdb26f6d3bad7809 /src/msvc_helper.h | |
| parent | a1f879b29c9aafe6a2bc0ba885701f8f4f19f772 (diff) | |
| parent | ed056bdd8c8d578a9952bd93b76f29c14199c85b (diff) | |
| download | Ninja-9cf70a20685ac3bd48fceac2ea268d449c7e78d5.zip Ninja-9cf70a20685ac3bd48fceac2ea268d449c7e78d5.tar.gz Ninja-9cf70a20685ac3bd48fceac2ea268d449c7e78d5.tar.bz2 | |
Merge branch 'master' into release
Diffstat (limited to 'src/msvc_helper.h')
| -rw-r--r-- | src/msvc_helper.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/msvc_helper.h b/src/msvc_helper.h index 70d1fff..568b9f9 100644 --- a/src/msvc_helper.h +++ b/src/msvc_helper.h @@ -13,9 +13,8 @@ // limitations under the License. #include <string> -using namespace std; -string EscapeForDepfile(const string& path); +std::string EscapeForDepfile(const std::string& path); /// Wraps a synchronous execution of a CL subprocess. struct CLWrapper { @@ -27,7 +26,7 @@ struct CLWrapper { /// Start a process and gather its raw output. Returns its exit code. /// Crashes (calls Fatal()) on error. - int Run(const string& command, string* output); + int Run(const std::string& command, std::string* output); void* env_block_; }; |