Merge topic 'cleanup-style'

68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)

1 files changed, 9 insertions, 9 deletions

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 47a0e85..4231243 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -267,7 +267,7 @@ bool cmCacheManager::LoadCache(const char* path,
         // If the entry is not internal to the cache being loaded
         // or if it is in the list of internal entries to be
         // imported, load it.
-        if ( internal || (e.Type != INTERNAL) || 
+        if ( internal || (e.Type != INTERNAL) ||
              (includes.find(entryKey) != includes.end()) )
           {
           // If we are loading the cache from another project,
@@ -478,7 +478,7 @@ bool cmCacheManager::SaveCache(const char* path)
     = this->GetCacheEntry("CMAKE_COMMAND");
   if ( cmakeCacheEntry )
     {
-    fout << "# It was generated by CMake: " << 
+    fout << "# It was generated by CMake: " <<
       cmakeCacheEntry->Value << std::endl;
     }
 
@@ -500,10 +500,10 @@ bool cmCacheManager::SaveCache(const char* path)
   fout << "########################\n";
   fout << "\n";
 
-  for( std::map<cmStdString, CacheEntry>::const_iterator i = 
+  for( std::map<cmStdString, CacheEntry>::const_iterator i =
          this->Cache.begin(); i != this->Cache.end(); ++i)
     {
-    const CacheEntry& ce = (*i).second; 
+    const CacheEntry& ce = (*i).second;
     CacheEntryType t = ce.Type;
     if(!ce.Initialized)
       {
@@ -641,7 +641,7 @@ void cmCacheManager::OutputHelpString(std::ostream& fout,
   std::string::size_type pos = 0;
   for (std::string::size_type i=0; i<=end; i++)
     {
-    if ((i==end) 
+    if ((i==end)
         || (helpString[i]=='\n')
         || ((i-pos >= 60) && (helpString[i]==' ')))
       {
@@ -700,12 +700,12 @@ void cmCacheManager::PrintCache(std::ostream& out) const
 {
   out << "=================================================" << std::endl;
   out << "CMakeCache Contents:" << std::endl;
-  for(std::map<cmStdString, CacheEntry>::const_iterator i = 
+  for(std::map<cmStdString, CacheEntry>::const_iterator i =
         this->Cache.begin(); i != this->Cache.end(); ++i)
     {
     if((*i).second.Type != INTERNAL)
       {
-      out << (*i).first.c_str() << " = " << (*i).second.Value.c_str() 
+      out << (*i).first.c_str() << " = " << (*i).second.Value.c_str()
           << std::endl;
       }
     }
@@ -768,7 +768,7 @@ bool cmCacheManager::CacheIterator::IsAtEnd() const
 
 void cmCacheManager::CacheIterator::Begin()
 {
-  this->Position = this->Container.Cache.begin(); 
+  this->Position = this->Container.Cache.begin();
 }
 
 bool cmCacheManager::CacheIterator::Find(const char* key)
@@ -781,7 +781,7 @@ void cmCacheManager::CacheIterator::Next()
 {
   if (!this->IsAtEnd())
     {
-    ++this->Position; 
+    ++this->Position;
     }
 }