Commit 1333b576 authored by Peter Kuemmel's avatar Peter Kuemmel

Ninja: build server fixes

Why does the other compiler give no error?
Seems there is somewhere a "using".
parent 9081e3a1
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment