[Cmake-commits] CMake branch, next, updated. v2.8.7-2478-g8236bb9

Eric Noulard eric.noulard at gmail.com
Mon Feb 6 11:23:12 EST 2012


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  8236bb990d1b08cd7933fd13d2e3c08519750742 (commit)
       via  5a948cd22b448bf03ec939d46ef289eba9b9407c (commit)
      from  1036a1f6c298baeb29018a5838de813a9b2c7392 (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=8236bb990d1b08cd7933fd13d2e3c08519750742
commit 8236bb990d1b08cd7933fd13d2e3c08519750742
Merge: 1036a1f 5a948cd
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Mon Feb 6 11:23:10 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 6 11:23:10 2012 -0500

    Merge topic 'ImproveCPackDoc-reloaded' into next
    
    5a948cd Fix non existent std::string::clear on VS6


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a948cd22b448bf03ec939d46ef289eba9b9407c
commit 5a948cd22b448bf03ec939d46ef289eba9b9407c
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Mon Feb 6 17:20:54 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon Feb 6 17:20:54 2012 +0100

    Fix non existent std::string::clear on VS6

diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index dde4953..02f69f1 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -786,7 +786,7 @@ int cmDocumentation::getDocumentedModulesListInDir(
         // No else if no section is found (undocumented module)
         }
       // No else cannot read first line (ignore this kind of error)
-      line.clear();
+      line = "";
       }
     }
   if (nbDocumentedModules>0)
@@ -887,7 +887,7 @@ int cmDocumentation::GetStructuredDocFromFile(
                docCtxIdx++;
                docContextStack[docCtxIdx]=SDOC_SECTION;
                /* drop the rest of the line */
-               line.clear();
+               line = "";
                newCtx = true;
             }
             else if (mkword.substr(0,3)=="end")

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

Summary of changes:
 Source/cmDocumentation.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list