From 81601796a64807689e6d0af2bbd263b672e8434d Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 6 Feb 2009 09:08:02 -0500 Subject: 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. --- Source/cmXMLSafe.cxx | 6 +++--- Source/cmXMLSafe.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx index 21b6bc3..5cf93ca 100644 --- a/Source/cmXMLSafe.cxx +++ b/Source/cmXMLSafe.cxx @@ -31,9 +31,9 @@ cmXMLSafe::cmXMLSafe(const char* s): } //---------------------------------------------------------------------------- -cmXMLSafe::cmXMLSafe(cmsys_stl::string const& str): - Data(str.c_str()), - Size(static_cast(str.length())), +cmXMLSafe::cmXMLSafe(cmsys_stl::string const& s): + Data(s.c_str()), + Size(static_cast(s.length())), DoQuotes(true) { } diff --git a/Source/cmXMLSafe.h b/Source/cmXMLSafe.h index 6352ad6..062ac5c 100644 --- a/Source/cmXMLSafe.h +++ b/Source/cmXMLSafe.h @@ -29,7 +29,7 @@ public: /** Construct with the data to be written. This assumes the data will exist for the duration of this object's life. */ 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 writing the content of an attribute value. By default quotes -- cgit v0.12