summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-09-09 14:55:22 (GMT)
committerBrad King <brad.king@kitware.com>2012-09-09 14:55:49 (GMT)
commit4e62784bf6c00bc01fd21dc08cac84b260ec9c11 (patch)
tree20cff0ffbf66a82337945bd0c5cbf2fa5c208016 /Source
parent9ad85dbb25c0c9098f7fac276b5d27a636f1924f (diff)
downloadCMake-4e62784bf6c00bc01fd21dc08cac84b260ec9c11.zip
CMake-4e62784bf6c00bc01fd21dc08cac84b260ec9c11.tar.gz
CMake-4e62784bf6c00bc01fd21dc08cac84b260ec9c11.tar.bz2
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.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmDocumentationFormatterDocbook.cxx4
-rw-r--r--Source/cmDocumentationFormatterDocbook.h2
2 files changed, 3 insertions, 3 deletions
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