COMP: fix style and work around old compilers

2 files changed, 5 insertions, 5 deletions

diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index a95c04d..ea6163a 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -111,9 +111,9 @@ bool cmFunctionHelperCommand::InvokeInitialPass
   // set the values for ARGV0 ARGV1 ...
   for (unsigned int t = 0; t < expandedArgs.size(); ++t)
     {
-    strStream.str("");
-    strStream << "ARGV" << t;
-    this->Makefile->AddDefinition(strStream.str().c_str(), 
+    cmOStringStream tmpStream;
+    tmpStream << "ARGV" << t;
+    this->Makefile->AddDefinition(tmpStream.str().c_str(), 
                                   expandedArgs[t].c_str());
     }
   
diff --git a/Source/cmFunctionCommand.h b/Source/cmFunctionCommand.h
index 908a668..36be51f 100644
--- a/Source/cmFunctionCommand.h
+++ b/Source/cmFunctionCommand.h
@@ -91,8 +91,8 @@ public:
       "    ...\n"
       "  endfunction(<name>)\n"
       "Define a function named <name> that takes arguments named "
-      "arg1 arg2 arg3 (...).  Commands listed after function, "
-      "but before the matching endfunction, are not invoked until the function "
+      "arg1 arg2 arg3 (...).  Commands listed after function, but before "
+      "the matching endfunction, are not invoked until the function "
       "is invoked.  When it is invoked, the commands recorded in the "
       "function are first modified by replacing formal parameters (${arg1}) "
       "with the arguments passed, and then invoked as normal commands. In "