change the names of internal variables so -Wshadow does not complain

Exceptions/ChangeLog

+
+2012-01-31 Lynn Garren <garren@fnal.gov> 
+
+	* change the names of internal variables so -Wshadow does not complain
+
 ==============================
 16.12.11 Release CLHEP-2.1.2.0
 ==============================

Exceptions/Exceptions/ZMexHandler.h

@@ -64,8 +64,8 @@ class ZMexHandlerBehavior {
 
 public:
   ZMexHandlerBehavior(
-    const std::string name = "ZMexHandlerBehavior"
-  ) : name_( name ) { }
+    const std::string aname = "ZMexHandlerBehavior"
+  ) : name_( aname ) { }
 
   virtual ~ZMexHandlerBehavior() { }
 

Exceptions/Exceptions/ZMexception.h

@@ -203,14 +203,14 @@ public:
   ZMexception(
     const std::string &      mesg
   , const ZMexSeverity howBad = ZMexSEVERITYenumLAST
-  , int                count  = ZMexception::_classInfo.nextCount()
+  , int                icount  = ZMexception::_classInfo.nextCount()
   );
 
   explicit
   ZMexception(
     const std::ostringstream & msg
   , const ZMexSeverity howBad = ZMexSEVERITYenumLAST
-  , int                count  = ZMexception::_classInfo.nextCount()
+  , int                icount  = ZMexception::_classInfo.nextCount()
   );
 
   virtual ~ZMexception() {}
@@ -455,8 +455,8 @@ public:
   }
 
   virtual bool isDerivedFrom(
-    const std::string name
-  , const std::string facility
+    const std::string aname
+  , const std::string afacility
   ) const {
     return  false;
   }
@@ -485,13 +485,13 @@ public:									\
     const std::string  & mesg						\
   , const zmex::ZMexSeverity howBad = 			\
 			zmex::ZMexSEVERITYenumLAST		\
-  , int                      count = _classInfo.nextCount()		\
+  , int                      icount = _classInfo.nextCount()		\
   )  :									\
     Parent(								\
       mesg								\
     , (howBad == zmex::ZMexSEVERITYenumLAST ? 		\
 			_classInfo.severity() : howBad)			\
-    , count								\
+    , icount								\
     )									\
   { }									\
 									\
@@ -499,13 +499,13 @@ public:									\
     const std::ostringstream&  msg					\
   , const zmex::ZMexSeverity howBad = 			\
 			zmex::ZMexSEVERITYenumLAST		\
-  , int                      count = _classInfo.nextCount()		\
+  , int                      icount = _classInfo.nextCount()		\
   )  :									\
     Parent(								\
       msg								\
     , (howBad == zmex::ZMexSEVERITYenumLAST ? 		\
 			_classInfo.severity() : howBad)			\
-    , count								\
+    , icount								\
     )									\
   { }									\
 									\

Exceptions/Exceptions/ZMexception.icc

@@ -46,13 +46,13 @@ namespace zmex  {
 inline ZMexception::ZMexception(
   const std::string  & mesg
 , const ZMexSeverity howBad
-, int                count
+, int                icount
 )  :
   message_(mesg)
 , line_( 0 )
 , sourceFileName_( "not ZMthrow'n as of yet" )
 , mySeverity_( howBad == ZMexSEVERITYenumLAST ? _classInfo.severity() : howBad )
-, myCount_( count )
+, myCount_( icount )
 , wasThrown_( false )
 { }
 
@@ -131,13 +131,13 @@ inline ZMexSeverity ZMexception::severity() const {
 // line()
 //-------------------------
 
-inline void ZMexception::location( int line, const std::string filename ) const  {
+inline void ZMexception::location( int iline, const std::string filename ) const  {
 #ifdef DEFECT_NO_MUTABLE
   ZMexception * localThis = const_cast<ZMexception * const>(this);
-  localThis->line_ = line;
+  localThis->line_ = iline;
   localThis->sourceFileName_ = filename;
 #else
-  line_ = line;
+  line_ = iline;
   sourceFileName_ = filename;
 #endif
 }

Exceptions/src/ZMexception.cc

@@ -197,13 +197,13 @@ std::string ZMexception::logMessage( const std::string optText ) const {
 ZMexception::ZMexception(
   const std::ostringstream &  msg
 , const ZMexSeverity howBad
-, int                count
+, int                icount
 )  :
   message_(msg.str())
 , line_( 0 )
 , sourceFileName_( "not ZMthrow'n as of yet" )
 , mySeverity_( howBad == ZMexSEVERITYenumLAST ? _classInfo.severity() : howBad )
-, myCount_( count )
+, myCount_( icount )
 , wasThrown_( false )
 { }