Selaa lähdekoodia

ERR: Ok, think before commit... This fixes two build problems. The missing brace and the std::string signature is different on gcc 2.95 and gcc 3.3.

Andy Cedilnik 22 vuotta sitten
vanhempi
sitoutus
d9658c15bc
1 muutettua tiedostoa jossa 7 lisäystä ja 5 poistoa
  1. 7 5
      Source/cmCTest.cxx

+ 7 - 5
Source/cmCTest.cxx

@@ -1396,14 +1396,16 @@ int cmCTest::CoverageDirectory()
         cov.m_Show = true;
         cov.m_Show = true;
         }
         }
       std::string::size_type kk;
       std::string::size_type kk;
-      for ( kk = 0; kk < lines.size(); kk ++ )
       //      std::cerr << "number of lines " << lines.size() << "\n";
       //      std::cerr << "number of lines " << lines.size() << "\n";
+      for ( kk = 0; kk < lines.size(); kk ++ )
+        {
         std::string& line = lines[kk];
         std::string& line = lines[kk];
         //std::cerr << line << "\n";
         //std::cerr << line << "\n";
-        std::string sub = line.substr(0, strlen("      ######"));
-        int count = atoi(sub.c_str());
-        if ( sub.compare(0, strlen("    #####"), "    #####") == 0 
-             || sub.compare("      ######") == 0 )
+        std::string sub1 = line.substr(0, strlen("    #####"));
+        std::string sub2 = line.substr(0, strlen("      ######"));
+        int count = atoi(sub2.c_str());
+        if ( sub1.compare("    #####") == 0 ||
+             sub2.compare("      ######") == 0 )
           {
           {
           if ( covlines[kk] == -1 )
           if ( covlines[kk] == -1 )
             {
             {