[Cmake-commits] [cmake-commits] king committed cmXMLSafe.cxx 1.2 1.3 cmXMLSafe.h 1.1 1.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Feb 6 09:08:04 EST 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv2510/Source
Modified Files:
cmXMLSafe.cxx cmXMLSafe.h
Log Message:
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.
Index: cmXMLSafe.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmXMLSafe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** cmXMLSafe.h 5 Feb 2009 21:31:37 -0000 1.1
--- cmXMLSafe.h 6 Feb 2009 14:08:02 -0000 1.2
***************
*** 30,34 ****
will exist for the duration of this object's life. */
cmXMLSafe(const char* s);
! cmXMLSafe(cmsys_stl::string const& str);
/** Specify whether to escape quotes too. This is needed when
--- 30,34 ----
will exist for the duration of this object's life. */
cmXMLSafe(const char* s);
! cmXMLSafe(cmsys_stl::string const& s);
/** Specify whether to escape quotes too. This is needed when
Index: cmXMLSafe.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmXMLSafe.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** cmXMLSafe.cxx 5 Feb 2009 22:09:28 -0000 1.2
--- cmXMLSafe.cxx 6 Feb 2009 14:08:02 -0000 1.3
***************
*** 32,38 ****
//----------------------------------------------------------------------------
! cmXMLSafe::cmXMLSafe(cmsys_stl::string const& str):
! Data(str.c_str()),
! Size(static_cast<unsigned long>(str.length())),
DoQuotes(true)
{
--- 32,38 ----
//----------------------------------------------------------------------------
! cmXMLSafe::cmXMLSafe(cmsys_stl::string const& s):
! Data(s.c_str()),
! Size(static_cast<unsigned long>(s.length())),
DoQuotes(true)
{
More information about the Cmake-commits
mailing list