[cmake-commits] hoffman committed cmCommandArgumentParserHelper.cxx 1.12.2.7 1.12.2.8 cmCommandArgumentParserHelper.h 1.8.2.3 1.8.2.4

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	cmCommandArgumentParserHelper.cxx 
	cmCommandArgumentParserHelper.h 
Log Message:
COMP: fix warning in release branch


Index: cmCommandArgumentParserHelper.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCommandArgumentParserHelper.h,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- cmCommandArgumentParserHelper.h	29 Jun 2007 16:58:18 -0000	1.8.2.3
+++ cmCommandArgumentParserHelper.h	2 Jul 2007 02:55:07 -0000	1.8.2.4
@@ -58,7 +58,7 @@
   char* CombineUnions(char* in1, char* in2);
 
   char* ExpandSpecialVariable(const char* key, const char* var);
-  char* ExpandVariable(const char* var, bool doingAt=false);
+  char* ExpandVariable(const char* var);
   char* ExpandVariableForAt(const char* var);
   void SetResult(const char* value);
 

Index: cmCommandArgumentParserHelper.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCommandArgumentParserHelper.cxx,v
retrieving revision 1.12.2.7
retrieving revision 1.12.2.8
diff -u -d -r1.12.2.7 -r1.12.2.8
--- cmCommandArgumentParserHelper.cxx	29 Jun 2007 16:58:18 -0000	1.12.2.7
+++ cmCommandArgumentParserHelper.cxx	2 Jul 2007 02:55:07 -0000	1.12.2.8
@@ -92,8 +92,7 @@
   return 0;
 }
 
-char* cmCommandArgumentParserHelper::ExpandVariable(const char* var,
-                                                    bool doingAt)
+char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
 {
   if(!var)
     {
@@ -126,7 +125,7 @@
   if(this->ReplaceAtSyntax)
     {
     // try to expand the variable
-    char* ret = this->ExpandVariable(var, true);
+    char* ret = this->ExpandVariable(var);
     // if the return was 0 and we want to replace empty strings
     // then return an empty string 
     if(!ret && this->RemoveEmpty)