Commit 7738569a authored by Lynn Garren's avatar Lynn Garren
Browse files

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

parent 73a45ff5
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
==============================
......
......@@ -64,8 +64,8 @@ class ZMexHandlerBehavior {
public:
ZMexHandlerBehavior(
const std::string name = "ZMexHandlerBehavior"
) : name_( name ) { }
const std::string aname = "ZMexHandlerBehavior"
) : name_( aname ) { }
virtual ~ZMexHandlerBehavior() { }
......
......@@ -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 \
) \
{ } \
\
......
......@@ -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
}
......
......@@ -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 )
{ }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment