[Cmake-commits] CMake branch, next, updated. v2.8.9-424-g6a04581

[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  6a04581ca4fae9709a5c1c98adc731fe4fb26251 (commit)
       via  4e62784bf6c00bc01fd21dc08cac84b260ec9c11 (commit)
      from  e2bc80608f0eda255d59a2f593ea9df6eb5fac39 (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=6a04581ca4fae9709a5c1c98adc731fe4fb26251
commit 6a04581ca4fae9709a5c1c98adc731fe4fb26251
Merge: e2bc806 4e62784
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Sep 9 10:57:41 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 9 10:57:41 2012 -0400

    Merge topic 'docbook-validate' into next
    
    4e62784 docbook: Fix formatter naming convention to avoid shadow


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e62784bf6c00bc01fd21dc08cac84b260ec9c11
commit 4e62784bf6c00bc01fd21dc08cac84b260ec9c11
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Sep 9 10:55:22 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Sep 9 10:55:49 2012 -0400

    docbook: Fix formatter naming convention to avoid shadow
    
    Some compilers complain:
    
     cmDocumentationFormatterDocbook.cxx: In member function virtual void cmDocumentationFormatterDocbook::PrintHeader(const char*, const char*, std::ostream&):
     cmDocumentationFormatterDocbook.cxx:197:73: warning: declaration of docname shadows a member of 'this' [-Wshadow]
    
    Fix the name of the member variable.

diff --git a/Source/cmDocumentationFormatterDocbook.cxx b/Source/cmDocumentationFormatterDocbook.cxx
index 9ff7847..a2ae20b 100644
--- a/Source/cmDocumentationFormatterDocbook.cxx
+++ b/Source/cmDocumentationFormatterDocbook.cxx
@@ -196,7 +196,7 @@ void cmDocumentationFormatterDocbook
 void cmDocumentationFormatterDocbook
 ::PrintHeader(const char* docname, const char* appname, std::ostream& os)
 {
-  this->docname = docname;
+  this->Docname = docname;
 
   // this one is used to ensure that we don't create multiple link targets
   // with the same name. We can clear it here since we are at the
@@ -229,7 +229,7 @@ void cmDocumentationFormatterDocbook
     {
     id = std::string(prefix) + "." + id;
     }
-  os << this->docname << '.' << id;
+  os << this->Docname << '.' << id;
 
   // make sure that each id exists only once.  Since it seems
   // not easily possible to determine which link refers to which id,
diff --git a/Source/cmDocumentationFormatterDocbook.h b/Source/cmDocumentationFormatterDocbook.h
index 6c96900..0352d34 100644
--- a/Source/cmDocumentationFormatterDocbook.h
+++ b/Source/cmDocumentationFormatterDocbook.h
@@ -37,7 +37,7 @@ public:
 private:
   void PrintId(std::ostream& os, const char* prefix, std::string id);
   std::set<std::string> EmittedLinkIds;
-  std::string docname;
+  std::string Docname;
 };
 
 #endif

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

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


hooks/post-receive
-- 
CMake