COMP: Avoid parameter/member shadow in cmXMLSafe

A cmXMLSafe constructor named its parameter 'str' which shadowed the
name of the 'str' method.  This renames the parameter to avoid the
conflict warning.
This commit is contained in:
Brad King 2009-02-06 09:08:02 -05:00
parent 67671ac400
commit 81601796a6
2 changed files with 4 additions and 4 deletions

View File

@ -31,9 +31,9 @@ cmXMLSafe::cmXMLSafe(const char* s):
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmXMLSafe::cmXMLSafe(cmsys_stl::string const& str): cmXMLSafe::cmXMLSafe(cmsys_stl::string const& s):
Data(str.c_str()), Data(s.c_str()),
Size(static_cast<unsigned long>(str.length())), Size(static_cast<unsigned long>(s.length())),
DoQuotes(true) DoQuotes(true)
{ {
} }

View File

@ -29,7 +29,7 @@ public:
/** Construct with the data to be written. This assumes the data /** Construct with the data to be written. This assumes the data
will exist for the duration of this object's life. */ will exist for the duration of this object's life. */
cmXMLSafe(const char* s); cmXMLSafe(const char* s);
cmXMLSafe(cmsys_stl::string const& str); cmXMLSafe(cmsys_stl::string const& s);
/** Specify whether to escape quotes too. This is needed when /** Specify whether to escape quotes too. This is needed when
writing the content of an attribute value. By default quotes writing the content of an attribute value. By default quotes