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

Fix signed/unsigned comparison warnings in ccmake 

Commit ff1f8d0b (Fix or cast more integer conversions in cmake) changed
a member type from int to size_t.  Update the types of variables
compared to these values to be unsigned also.
This commit is contained in:
Brad King 2010-06-29 11:09:36 -04:00
parent ff1f8d0b53
commit fec71d8016
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/CursesDialog/cmCursesMainForm.cxx
View File

@ -242,7 +242,7 @@ void cmCursesMainForm::RePost()
// Assign the fields: 3 for each entry: label, new entry marker // Assign the fields: 3 for each entry: label, new entry marker
// ('*' or ' ') and entry widget // ('*' or ' ') and entry widget
this->Fields = new FIELD*[3*this->NumberOfVisibleEntries+1]; this->Fields = new FIELD*[3*this->NumberOfVisibleEntries+1];
int cc; size_t cc;
for ( cc = 0; cc < 3 * this->NumberOfVisibleEntries+1; cc ++ ) for ( cc = 0; cc < 3 * this->NumberOfVisibleEntries+1; cc ++ )
{ {
this->Fields[cc] = 0; this->Fields[cc] = 0;
@ -529,7 +529,7 @@ void cmCursesMainForm::UpdateStatusBar(const char* message)
size_t i, curFieldLen = strlen(curField); size_t i, curFieldLen = strlen(curField);
size_t helpLen = strlen(help); size_t helpLen = strlen(help);
int width; size_t width;
if (x < cmCursesMainForm::MAX_WIDTH ) if (x < cmCursesMainForm::MAX_WIDTH )
{ {
width = x; width = x;
@ -796,7 +796,7 @@ void cmCursesMainForm::RemoveEntry(const char* value)
void cmCursesMainForm::FillCacheManagerFromUI() void cmCursesMainForm::FillCacheManagerFromUI()
{ {
size_t size = this->Entries->size(); size_t size = this->Entries->size();
for(int i=0; i < size; i++) for(size_t i=0; i < size; i++)
{ {
cmCacheManager::CacheIterator it = cmCacheManager::CacheIterator it =
this->CMakeInstance->GetCacheManager()->GetCacheIterator( this->CMakeInstance->GetCacheManager()->GetCacheIterator(
@ -961,7 +961,7 @@ void cmCursesMainForm::HandleInput()
else if ( key == KEY_DOWN || key == ctrl('n') ) else if ( key == KEY_DOWN || key == ctrl('n') )
{ {
FIELD* cur = current_field(this->Form); FIELD* cur = current_field(this->Form);
int findex = field_index(cur); size_t findex = field_index(cur);
if ( findex == 3*this->NumberOfVisibleEntries-1 ) if ( findex == 3*this->NumberOfVisibleEntries-1 )
{ {
continue; continue;
@ -1108,7 +1108,7 @@ void cmCursesMainForm::HandleInput()
{ {
this->OkToGenerate = false; this->OkToGenerate = false;
FIELD* cur = current_field(this->Form); FIELD* cur = current_field(this->Form);
int findex = field_index(cur); size_t findex = field_index(cur);
// make the next or prev. current field after deletion // make the next or prev. current field after deletion
// each entry consists of fields: label, isnew, value // each entry consists of fields: label, isnew, value
@ -1199,7 +1199,7 @@ void cmCursesMainForm::JumpToCacheEntry(int idx, const char* astr)
str = cmSystemTools::LowerCase(astr); str = cmSystemTools::LowerCase(astr);
} }
if ( idx > this->NumberOfVisibleEntries ) if ( size_t(idx) > this->NumberOfVisibleEntries )
{ {
return; return;
} }
@ -1232,7 +1232,7 @@ void cmCursesMainForm::JumpToCacheEntry(int idx, const char* astr)
} }
} }
} }
if ( findex >= 3* this->NumberOfVisibleEntries-1 ) if ( size_t(findex) >= 3* this->NumberOfVisibleEntries-1 )
{ {
set_current_field(this->Form, this->Fields[2]); set_current_field(this->Form, this->Fields[2]);
} }