kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ninja: build server fixes 

Why does the other compiler give no error?
Seems there is somewhere a "using".
This commit is contained in:
Peter Kuemmel 2012-06-17 10:08:57 +02:00
parent 9081e3a135
commit 1333b576b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmcldeps.cxx
View File

@ -577,8 +577,8 @@ static void outputDepFile(const std::string& dfile, const std::string& objfile,
return; return;
// strip duplicates // strip duplicates
sort(incs.begin(), incs.end()); std::sort(incs.begin(), incs.end());
incs.erase(unique(incs.begin(), incs.end()), incs.end()); incs.erase(std::unique(incs.begin(), incs.end()), incs.end());
FILE* out = fopen(dfile.c_str(), "wb"); FILE* out = fopen(dfile.c_str(), "wb");
@ -651,7 +651,7 @@ static int process( const std::string& srcfilename,
std::string line; std::string line;
std::vector<std::string> includes; std::vector<std::string> includes;
bool isFirstLine = true; // cl prints always first the source filename bool isFirstLine = true; // cl prints always first the source filename
while (getline(ss, line)) { while (std::getline(ss, line)) {
if (startsWith(line, prefix)) { if (startsWith(line, prefix)) {
std::string inc = trimLeadingSpace(line.substr(prefix.size()).c_str()); std::string inc = trimLeadingSpace(line.substr(prefix.size()).c_str());
if (inc[inc.size() - 1] == '\r') // blech, stupid \r\n if (inc[inc.size() - 1] == '\r') // blech, stupid \r\n