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

Avoid shadowing std::vector member 

The cmProcess::Buffer class derives from std::vector.  We were using
local variable 'data' in the GetLine method but this name shadowed a
member of vector with GNU.  This renames it to 'text'.
This commit is contained in:
Brad King 2009-09-12 10:20:00 -04:00
parent cde1005442
commit bcbb4626a3
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/CTest/cmProcess.cxx
View File

@ -82,10 +82,10 @@ bool cmProcess::Buffer::GetLine(std::string& line)
if((*this)[this->Last] == '\n' || (*this)[this->Last] == '\0') if((*this)[this->Last] == '\n' || (*this)[this->Last] == '\0')
{ {
// Extract the range first..last as a line. // Extract the range first..last as a line.
const char* data = &*this->begin() + this->First; const char* text = &*this->begin() + this->First;
size_type length = this->Last - this->First; size_type length = this->Last - this->First;
length -= (length && data[length-1] == '\r')? 1:0; length -= (length && text[length-1] == '\r')? 1:0;
line.assign(data, length); line.assign(text, length);
// Start a new range for the next line. // Start a new range for the next line.
++this->Last; ++this->Last;