[Cmake-commits] CMake branch, next, updated. v2.8.2-146-g48e44e4

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  48e44e488b8ff7f2eb97fbf4e0349fac93befde3 (commit)
       via  fec71d80165a74c423b8c56b00993ab4fb917041 (commit)
      from  16456ba43791c8dad9dace543f1eb17d2c3e9750 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48e44e488b8ff7f2eb97fbf4e0349fac93befde3
commit 48e44e488b8ff7f2eb97fbf4e0349fac93befde3
Merge: 16456ba fec71d8
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 11:12:56 2010 -0400

    Merge branch 'fix-cmake-conversion-warnings' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fec71d80165a74c423b8c56b00993ab4fb917041
commit fec71d80165a74c423b8c56b00993ab4fb917041
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 11:09:36 2010 -0400

    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.

diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 805d5ec..389ec7f 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -242,7 +242,7 @@ void cmCursesMainForm::RePost()
   // Assign the fields: 3 for each entry: label, new entry marker
   // ('*' or ' ') and entry widget
   this->Fields = new FIELD*[3*this->NumberOfVisibleEntries+1];
-  int cc;
+  size_t cc;
   for ( cc = 0; cc < 3 * this->NumberOfVisibleEntries+1; cc ++ )
     {
     this->Fields[cc] = 0;
@@ -529,7 +529,7 @@ void cmCursesMainForm::UpdateStatusBar(const char* message)
   size_t i, curFieldLen = strlen(curField);
   size_t helpLen = strlen(help);
 
-  int width;
+  size_t width;
   if (x < cmCursesMainForm::MAX_WIDTH )
     {
     width = x;
@@ -796,7 +796,7 @@ void cmCursesMainForm::RemoveEntry(const char* value)
 void cmCursesMainForm::FillCacheManagerFromUI()
 {   
   size_t size = this->Entries->size();
-  for(int i=0; i < size; i++)
+  for(size_t i=0; i < size; i++)
     {
     cmCacheManager::CacheIterator it = 
       this->CMakeInstance->GetCacheManager()->GetCacheIterator(
@@ -961,7 +961,7 @@ void cmCursesMainForm::HandleInput()
       else if ( key == KEY_DOWN || key == ctrl('n') )
         {
         FIELD* cur = current_field(this->Form);
-        int findex = field_index(cur);
+        size_t findex = field_index(cur);
         if ( findex == 3*this->NumberOfVisibleEntries-1 )
           {
           continue;
@@ -1108,7 +1108,7 @@ void cmCursesMainForm::HandleInput()
         {
         this->OkToGenerate = false;
         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
         // each entry consists of fields: label, isnew, value
@@ -1199,7 +1199,7 @@ void cmCursesMainForm::JumpToCacheEntry(int idx, const char* astr)
     str = cmSystemTools::LowerCase(astr);
     }
 
-  if ( idx > this->NumberOfVisibleEntries )
+  if ( size_t(idx) > this->NumberOfVisibleEntries )
     {
     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]);
       }

-----------------------------------------------------------------------

Summary of changes:
 Source/CursesDialog/cmCursesMainForm.cxx |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake