diff options
| author | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-17 08:08:57 (GMT) |
|---|---|---|
| committer | Peter Kuemmel <syntheticpp@gmx.net> | 2012-06-17 08:09:10 (GMT) |
| commit | 1333b576b56de852d826e886955d09de0f8c0ef6 (patch) | |
| tree | 3e70ce60afda26de3d3a3603d4b51d04d2272336 /Source | |
| parent | 9081e3a1355bf312e54b4a71e879a72e93933ef0 (diff) | |
| download | CMake-1333b576b56de852d826e886955d09de0f8c0ef6.zip CMake-1333b576b56de852d826e886955d09de0f8c0ef6.tar.gz CMake-1333b576b56de852d826e886955d09de0f8c0ef6.tar.bz2 | |
Ninja: build server fixes
Why does the other compiler give no error?
Seems there is somewhere a "using".
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmcldeps.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index bf5a17b..d8bb162 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -577,8 +577,8 @@ static void outputDepFile(const std::string& dfile, const std::string& objfile, return; // strip duplicates - sort(incs.begin(), incs.end()); - incs.erase(unique(incs.begin(), incs.end()), incs.end()); + std::sort(incs.begin(), incs.end()); + incs.erase(std::unique(incs.begin(), incs.end()), incs.end()); FILE* out = fopen(dfile.c_str(), "wb"); @@ -651,7 +651,7 @@ static int process( const std::string& srcfilename, std::string line; std::vector<std::string> includes; bool isFirstLine = true; // cl prints always first the source filename - while (getline(ss, line)) { + while (std::getline(ss, line)) { if (startsWith(line, prefix)) { std::string inc = trimLeadingSpace(line.substr(prefix.size()).c_str()); if (inc[inc.size() - 1] == '\r') // blech, stupid \r\n |