[cmake-commits] king committed cmAddCustomTargetCommand.cxx 1.28 1.29 cmAddExecutableCommand.cxx 1.34 1.35 cmAddLibraryCommand.cxx 1.35 1.36

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Feb 11 17:33:48 EST 2008


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv5310

Modified Files:
	cmAddCustomTargetCommand.cxx cmAddExecutableCommand.cxx 
	cmAddLibraryCommand.cxx 
Log Message:
COMP: Fix shadowed local variable warning.


Index: cmAddLibraryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddLibraryCommand.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- cmAddLibraryCommand.cxx	11 Feb 2008 18:35:39 -0000	1.35
+++ cmAddLibraryCommand.cxx	11 Feb 2008 22:33:46 -0000	1.36
@@ -128,12 +128,14 @@
     }
 
   // Enforce name uniqueness.
+  {
   std::string msg;
   if(!this->Makefile->EnforceUniqueName(libName, msg))
     {
     this->SetError(msg.c_str());
     return false;
     }
+  }
 
   if (s == args.end())
     {

Index: cmAddCustomTargetCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddCustomTargetCommand.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cmAddCustomTargetCommand.cxx	11 Feb 2008 18:35:39 -0000	1.28
+++ cmAddCustomTargetCommand.cxx	11 Feb 2008 22:33:46 -0000	1.29
@@ -159,12 +159,14 @@
     }
 
   // Enforce name uniqueness.
+  {
   std::string msg;
   if(!this->Makefile->EnforceUniqueName(args[0], msg))
     {
     this->SetError(msg.c_str());
     return false;
     }
+  }
 
   // Add the utility target to the makefile.
   bool escapeOldStyle = !verbatim;

Index: cmAddExecutableCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddExecutableCommand.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- cmAddExecutableCommand.cxx	11 Feb 2008 18:35:39 -0000	1.34
+++ cmAddExecutableCommand.cxx	11 Feb 2008 22:33:46 -0000	1.35
@@ -101,12 +101,14 @@
     }
 
   // Enforce name uniqueness.
+  {
   std::string msg;
   if(!this->Makefile->EnforceUniqueName(exename, msg))
     {
     this->SetError(msg.c_str());
     return false;
     }
+  }
 
   if (s == args.end())
     {



More information about the Cmake-commits mailing list