[Cmake-commits] [cmake-commits] martink committed cmMakefile.cxx 1.470 1.471

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13552/Source

Modified Files:
	cmMakefile.cxx 
Log Message:
ENH: make end of file checking for close if, foreach, macro, functions etc enabled. Not sure why it was disabled to start with, but I suspect I will find out. In reponse to Bill email about a ctest -S script with a function that waqs not closed. Closure was only checked for regular listfiles not other files.


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.470
retrieving revision 1.471
diff -C 2 -d -r1.470 -r1.471
*** cmMakefile.cxx	14 May 2008 15:54:52 -0000	1.470
--- cmMakefile.cxx	31 May 2008 12:15:00 -0000	1.471
***************
*** 488,498 ****
        this->cmCurrentListFile = filename;
        }
!     // loop over current function blockers and record them
!     std::list<cmFunctionBlocker *>::iterator pos;
!     for (pos = this->FunctionBlockers.begin();
!          pos != this->FunctionBlockers.end(); ++pos)
!       {
!       originalBlockers.insert(*pos);
!       }
      }
  
--- 488,499 ----
        this->cmCurrentListFile = filename;
        }
!     }
! 
!   // loop over current function blockers and record them
!   std::list<cmFunctionBlocker *>::iterator pos;
!   for (pos = this->FunctionBlockers.begin();
!        pos != this->FunctionBlockers.end(); ++pos)
!     {
!     originalBlockers.insert(*pos);
      }
  
***************
*** 543,547 ****
    // add this list file to the list of dependencies
    this->ListFiles.push_back( filenametoread);
!   bool endScopeNicely = filename? true: false;
    const size_t numberFunctions = cacheFile.Functions.size();
    for(size_t i =0; i < numberFunctions; ++i)
--- 544,548 ----
    // add this list file to the list of dependencies
    this->ListFiles.push_back( filenametoread);
!   bool endScopeNicely = true;
    const size_t numberFunctions = cacheFile.Functions.size();
    for(size_t i =0; i < numberFunctions; ++i)