From 89f4aacf98d304c21d1ccb49d1df4f6e1cc676f2 Mon Sep 17 00:00:00 2001
From: mes5k <mes5k>
Date: Sat, 9 Apr 2011 18:30:32 +0000
Subject: [PATCH] fixed shadow variable name problem

---
 include/tclap/DocBookOutput.h       | 4 ++--
 include/tclap/StdOutput.h           | 4 ++--
 include/tclap/ZshCompletionOutput.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/tclap/DocBookOutput.h b/include/tclap/DocBookOutput.h
index d2f1290..a42ca27 100644
--- a/include/tclap/DocBookOutput.h
+++ b/include/tclap/DocBookOutput.h
@@ -96,7 +96,7 @@ inline void DocBookOutput::usage(CmdLineInterface& _cmd )
 {
 	std::list<Arg*> argList = _cmd.getArgList();
 	std::string progName = _cmd.getProgramName();
-	std::string version = _cmd.getVersion();
+	std::string xversion = _cmd.getVersion();
 	theDelimiter = _cmd.getDelimiter();
 	XorHandler xorHandler = _cmd.getXorHandler();
 	std::vector< std::vector<Arg*> > xorList = xorHandler.getXorList();
@@ -163,7 +163,7 @@ inline void DocBookOutput::usage(CmdLineInterface& _cmd )
 	std::cout << "<refsect1>" << std::endl;
 	std::cout << "<title>Version</title>" << std::endl;
 	std::cout << "<para>" << std::endl;
-	std::cout << version << std::endl; 
+	std::cout << xversion << std::endl; 
 	std::cout << "</para>" << std::endl;
 	std::cout << "</refsect1>" << std::endl;
 	
diff --git a/include/tclap/StdOutput.h b/include/tclap/StdOutput.h
index 9ceac0c..35f7b99 100644
--- a/include/tclap/StdOutput.h
+++ b/include/tclap/StdOutput.h
@@ -108,10 +108,10 @@ class StdOutput : public CmdLineOutput
 inline void StdOutput::version(CmdLineInterface& _cmd) 
 {
 	std::string progName = _cmd.getProgramName();
-	std::string version = _cmd.getVersion();
+	std::string xversion = _cmd.getVersion();
 
 	std::cout << std::endl << progName << "  version: " 
-			  << version << std::endl << std::endl;
+			  << xversion << std::endl << std::endl;
 }
 
 inline void StdOutput::usage(CmdLineInterface& _cmd ) 
diff --git a/include/tclap/ZshCompletionOutput.h b/include/tclap/ZshCompletionOutput.h
index 34f159c..0b37fc7 100644
--- a/include/tclap/ZshCompletionOutput.h
+++ b/include/tclap/ZshCompletionOutput.h
@@ -107,7 +107,7 @@ inline void ZshCompletionOutput::usage(CmdLineInterface& _cmd )
 {
 	std::list<Arg*> argList = _cmd.getArgList();
 	std::string progName = _cmd.getProgramName();
-	std::string version = _cmd.getVersion();
+	std::string xversion = _cmd.getVersion();
 	theDelimiter = _cmd.getDelimiter();
 	basename(progName);