Commit 086cd091 authored by Lynn Garren's avatar Lynn Garren
Browse files

deal with various warnings

parent a180a3a7
......@@ -74,7 +74,7 @@ public:
}
virtual std::string name() const { return name_; }
virtual ZMexAction takeCareOf( const ZMexception & x ) { return ZMexThrowIt; }
virtual ZMexAction takeCareOf( const ZMexception & ) { return ZMexThrowIt; }
protected:
/*virtual void handleLog( ZMexception & x, const int limit );*/
......
......@@ -90,7 +90,7 @@ inline ZMexAction ZMexIgnoreNextN::takeCareOf( const ZMexception & x ) {
//
//********************************
inline ZMexAction ZMexHandleViaParent::takeCareOf( const ZMexception & x ) {
inline ZMexAction ZMexHandleViaParent::takeCareOf( const ZMexception & ) {
//DEBUG cerr << "HandleViaParent::takeCareOf" << endl;
return ZMexHANDLEVIAPARENT;
}
......
......@@ -455,8 +455,8 @@ public:
}
virtual bool isDerivedFrom(
const std::string aname
, const std::string afacility
const std::string
, const std::string
) const {
return false;
}
......
......@@ -44,16 +44,16 @@ ZMexLogBehavior::~ZMexLogBehavior() { ; }
ZMexLogBehavior *
ZMexLogBehavior::clone() const { return new ZMexLogBehavior( *this ); }
ZMexLogResult ZMexLogBehavior::emit( const ZMexception & x ) {
ZMexLogResult ZMexLogBehavior::emit( const ZMexception & ) {
return ZMexNOTLOGGED;
}
ZMexLogResult ZMexLogBehavior::emit(
const std::string & s
const std::string &
) {
//DEBUG cerr << "ZMexLogBehavior::emit()" << endl;
// Do nothing with s (but do it well!):
// Do nothing with string& (but do it well!):
return ZMexNOTLOGGED;
}
......@@ -73,16 +73,16 @@ ZMexLogNever::~ZMexLogNever() { ; }
ZMexLogNever *
ZMexLogNever::clone() const { return new ZMexLogNever( *this ); }
ZMexLogResult ZMexLogNever::emit( const ZMexception & x ) {
ZMexLogResult ZMexLogNever::emit( const ZMexception & ) {
return ZMexNOTLOGGED; //
}
ZMexLogResult ZMexLogNever::emit(
const std::string & s
const std::string &
) {
//DEBUG cerr << "ZMexLogNever::emit()" << endl;
// Do nothing with s (but do it well!):
// Do nothing with string& (but do it well!):
return ZMexNOTLOGGED;
}
......@@ -182,11 +182,11 @@ ZMexLogViaParent::~ZMexLogViaParent() { ; }
ZMexLogViaParent *
ZMexLogViaParent::clone() const { return new ZMexLogViaParent( *this ); }
ZMexLogResult ZMexLogViaParent::emit( const ZMexception & x ) {
ZMexLogResult ZMexLogViaParent::emit( const ZMexception & ) {
return ZMexLOGVIAPARENT; //
}
ZMexLogResult ZMexLogViaParent::emit( const std::string & s ) {
ZMexLogResult ZMexLogViaParent::emit( const std::string & ) {
//DEBUG cerr << "ZMexLogViaParent::emit( \"" << s << "\" )" << endl;
// Bump logging decisions to someone else's logger:
......
......@@ -15,7 +15,7 @@ ACos::ACos()
ACos::~ACos() {
}
ACos::ACos(const ACos & right)
ACos::ACos(const ACos & right) : AbsFunction(right)
{ }
......
......@@ -15,7 +15,7 @@ ASin::ASin()
ASin::~ASin() {
}
ASin::ASin(const ASin & right)
ASin::ASin(const ASin & right) : AbsFunction(right)
{ }
......
......@@ -14,7 +14,7 @@ ATan::ATan()
ATan::~ATan() {
}
ATan::ATan(const ATan & right)
ATan::ATan(const ATan & right) : AbsFunction(right)
{ }
......
......@@ -11,7 +11,7 @@ FUNCTION_OBJECT_IMP(Abs)
Abs::Abs()
{}
Abs::Abs(const Abs & right)
Abs::Abs(const Abs & right) : AbsFunction(right)
{
}
......
......@@ -26,6 +26,9 @@ AbsFunction::AbsFunction() {
AbsFunction::~AbsFunction() {
}
AbsFunction::AbsFunction(const AbsFunction &) {
}
FunctionComposition AbsFunction::operator () (const AbsFunction &function) const {
return FunctionComposition(this, &function);
}
......
......@@ -11,6 +11,9 @@ AbsParameter::AbsParameter() {
AbsParameter::~AbsParameter(){
}
AbsParameter::AbsParameter(const AbsParameter &)
{}
AbsParameter *AbsParameter::clone() const {
return _clone();
}
......
......@@ -16,6 +16,7 @@ namespace Genfun {
}
AdaptiveRKStepper::AdaptiveRKStepper(const AdaptiveRKStepper & right):
RKStepper(right),
eeStepper(right.eeStepper->clone()),
T(right.T),
sStepsize(right.sStepsize),
......
......@@ -20,6 +20,7 @@ AnalyticConvolution::AnalyticConvolution(AnalyticConvolution::Type type
}
AnalyticConvolution::AnalyticConvolution(const AnalyticConvolution & right):
AbsFunction(right),
_lifetime (right._lifetime),
_frequency (right._frequency),
_sigma (right._sigma),
......
......@@ -15,7 +15,7 @@ ArrayFunction::~ArrayFunction(){}
// Copy constructor
ArrayFunction::ArrayFunction(const ArrayFunction &right):
_values(right._values) {}
AbsFunction(right), _values(right._values) {}
// Retreive function value
double ArrayFunction::operator ()(double argument) const {
......
......@@ -25,6 +25,7 @@ AssociatedLaguerre::~AssociatedLaguerre() {
}
AssociatedLaguerre::AssociatedLaguerre(const AssociatedLaguerre & right):
AbsFunction(right),
_n(right._n),
_k(right._k)
{
......
......@@ -16,6 +16,7 @@ BetaDistribution::BetaDistribution():
{}
BetaDistribution::BetaDistribution(const BetaDistribution & right):
AbsFunction( right ),
_alpha(right._alpha),
_beta (right._beta)
{
......
......@@ -26,6 +26,7 @@ BivariateGaussian::~BivariateGaussian() {
}
BivariateGaussian::BivariateGaussian(const BivariateGaussian & right):
AbsFunction(right),
_mean0(right._mean0),
_mean1(right._mean1),
_sigma0(right._sigma0),
......@@ -103,7 +104,7 @@ unsigned int BivariateGaussian::dimensionality() const {
return 2;
}
double BivariateGaussian::operator ()(double x) const
double BivariateGaussian::operator ()(double) const
{
std::cerr
<< "Warning. bivariate Gaussian called with scalar argument"
......
......@@ -16,7 +16,7 @@ namespace Genfun {
}
EnergyFunction::EnergyFunction(const EnergyFunction & right)
:solver(right.solver)
:AbsFunction(right), solver(right.solver)
{ }
......
......@@ -13,6 +13,7 @@ ConstMinusFunction::ConstMinusFunction(double constant, const AbsFunction *arg):
}
ConstMinusFunction::ConstMinusFunction(const ConstMinusFunction & right) :
AbsFunction(right),
_constant(right._constant),
_arg(right._arg->clone())
{}
......
......@@ -15,6 +15,7 @@ ConstMinusParameter::ConstMinusParameter(double xconstant, const AbsParameter *a
}
ConstMinusParameter::ConstMinusParameter(const ConstMinusParameter & right) :
AbsParameter(right),
_constant(right._constant),
_parameter(right._parameter->clone())
{}
......
......@@ -12,6 +12,7 @@ ConstOverFunction::ConstOverFunction(double constant, const AbsFunction *arg):
}
ConstOverFunction::ConstOverFunction(const ConstOverFunction & right) :
AbsFunction(right),
_constant(right._constant),
_arg(right._arg->clone())
{}
......
Supports Markdown
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