From 897dae5b2f7a2fbca7ff82cd3bcf9365d56ed8a5 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 15 Jun 2015 15:20:29 +0200 Subject: [PATCH] compatibility fix: __unused changed to __dumb --- lib/Math.hpp | 2 +- lib/MathInterpreter.cpp | 2 +- lib/Minimizer.cpp | 12 ++++++------ lib/MinuitMinimizer.cpp | 2 +- lib/StatArray.hpp | 2 +- lib/XYSampleData.cpp | 38 +++++++++++++++++++------------------- lib/XYStatData.cpp | 32 ++++++++++++++++---------------- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/lib/Math.hpp b/lib/Math.hpp index a7c821e..84f2270 100644 --- a/lib/Math.hpp +++ b/lib/Math.hpp @@ -35,7 +35,7 @@ namespace MATH_NAMESPACE { // integer power function template - typename std::enable_if<(n == 0), T>::type pow(const T x __unused) + typename std::enable_if<(n == 0), T>::type pow(const T x __dumb) { return 1; } diff --git a/lib/MathInterpreter.cpp b/lib/MathInterpreter.cpp index d28c3bb..4174a77 100644 --- a/lib/MathInterpreter.cpp +++ b/lib/MathInterpreter.cpp @@ -462,7 +462,7 @@ void VarNode::compile(Program &program, RunContext &context) const } // CstNode compile ///////////////////////////////////////////////////////////// -void CstNode::compile(Program &program, RunContext &context __unused) const +void CstNode::compile(Program &program, RunContext &context __dumb) const { PUSH_INS(program, Push, strTo(getName())); } diff --git a/lib/Minimizer.cpp b/lib/Minimizer.cpp index 784f87c..cf32506 100644 --- a/lib/Minimizer.cpp +++ b/lib/Minimizer.cpp @@ -43,7 +43,7 @@ double Minimizer::getHighLimit(const Index i) const return highLimit_(i); } -const DVec & Minimizer::getHighLimit(const PlaceHolder ph __unused) const +const DVec & Minimizer::getHighLimit(const PlaceHolder ph __dumb) const { return highLimit_; } @@ -53,7 +53,7 @@ double Minimizer::getLowLimit(const Index i) const return lowLimit_(i); } -const DVec & Minimizer::getLowLimit(const PlaceHolder ph __unused) const +const DVec & Minimizer::getLowLimit(const PlaceHolder ph __dumb) const { return lowLimit_; } @@ -81,7 +81,7 @@ void Minimizer::setHighLimit(const Index i, const double l) } } -void Minimizer::setHighLimit(const PlaceHolder ph __unused, const DVec &l) +void Minimizer::setHighLimit(const PlaceHolder ph __dumb, const DVec &l) { if (l.size() != getDim()) { @@ -107,7 +107,7 @@ void Minimizer::setLowLimit(const Index i, const double l) } } -void Minimizer::setLowLimit(const PlaceHolder ph __unused, const DVec &l) +void Minimizer::setLowLimit(const PlaceHolder ph __dumb, const DVec &l) { if (l.size() != getDim()) { @@ -132,7 +132,7 @@ void Minimizer::useHighLimit(const Index i, const bool use) } } -void Minimizer::useHighLimit(const PlaceHolder ph __unused, const bool use) +void Minimizer::useHighLimit(const PlaceHolder ph __dumb, const bool use) { hasHighLimit_.fill(use); } @@ -149,7 +149,7 @@ void Minimizer::useLowLimit(const Index i, const bool use) } } -void Minimizer::useLowLimit(const PlaceHolder ph __unused, const bool use) +void Minimizer::useLowLimit(const PlaceHolder ph __dumb, const bool use) { hasLowLimit_.fill(use); } diff --git a/lib/MinuitMinimizer.cpp b/lib/MinuitMinimizer.cpp index 0228281..2b3f052 100644 --- a/lib/MinuitMinimizer.cpp +++ b/lib/MinuitMinimizer.cpp @@ -75,7 +75,7 @@ double MinuitMinimizer::getPrecision(void) const return 0.; } -void MinuitMinimizer::setPrecision(const double precision __unused) +void MinuitMinimizer::setPrecision(const double precision __dumb) { LATAN_ERROR(Implementation, "Minuit minimizer precision cannot be accessed"); diff --git a/lib/StatArray.hpp b/lib/StatArray.hpp index 4cbd828..3f92485 100644 --- a/lib/StatArray.hpp +++ b/lib/StatArray.hpp @@ -247,7 +247,7 @@ namespace ReducOp } template - inline T tensProd(const T &v1 __unused, const T &v2 __unused) + inline T tensProd(const T &v1 __dumb, const T &v2 __dumb) { LATAN_ERROR(Implementation, "tensorial product not implemented for this type"); diff --git a/lib/XYSampleData.cpp b/lib/XYSampleData.cpp index b6e750a..e0bcd92 100644 --- a/lib/XYSampleData.cpp +++ b/lib/XYSampleData.cpp @@ -31,7 +31,7 @@ double SampleFitResult::getChi2(const Index s) const return chi2_[s]; } -const DSample & SampleFitResult::getChi2(const PlaceHolder ph __unused) const +const DSample & SampleFitResult::getChi2(const PlaceHolder ph __dumb) const { return chi2_; } @@ -41,7 +41,7 @@ double SampleFitResult::getChi2PerDof(const Index s) const return chi2_[s]/getNDof(); } -DSample SampleFitResult::getChi2PerDof(const PlaceHolder ph __unused) const +DSample SampleFitResult::getChi2PerDof(const PlaceHolder ph __dumb) const { return chi2_/getNDof(); } @@ -58,7 +58,7 @@ const DoubleFunction & SampleFitResult::getModel(const Index s, } const DoubleFunctionSample & SampleFitResult::getModel( - const PlaceHolder ph __unused, + const PlaceHolder ph __dumb, const Index j) const { return model_[static_cast(j)]; @@ -94,23 +94,23 @@ void XYSampleData::resize(const Index nData, const Index xDim, isCovarianceInit_ = false; } -XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __unused, - const PlaceHolder ph2 __unused) +XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __dumb, + const PlaceHolder ph2 __dumb) { isCovarianceInit_ = false; return x_.block(0, 0, getNData(), getXDim()); } -XYSampleData::ConstSampleBlock XYSampleData::x(const PlaceHolder ph1 __unused, - const PlaceHolder ph2 __unused) +XYSampleData::ConstSampleBlock XYSampleData::x(const PlaceHolder ph1 __dumb, + const PlaceHolder ph2 __dumb) const { return x_.block(0, 0, getNData(), getXDim()); } XYSampleData::SampleBlock XYSampleData::x(const Index i, - const PlaceHolder ph2 __unused) + const PlaceHolder ph2 __dumb) { isCovarianceInit_ = false; @@ -118,13 +118,13 @@ XYSampleData::SampleBlock XYSampleData::x(const Index i, } XYSampleData::ConstSampleBlock XYSampleData::x(const Index i, - const PlaceHolder ph2 __unused) + const PlaceHolder ph2 __dumb) const { return x_.block(0, i, getNData(), 1); } -XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __unused, +XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __dumb, const Index k) { isCovarianceInit_ = false; @@ -132,7 +132,7 @@ XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __unused, return x_.block(k, 0, 1, getXDim()); } -XYSampleData::ConstSampleBlock XYSampleData::x(const PlaceHolder ph1 __unused, +XYSampleData::ConstSampleBlock XYSampleData::x(const PlaceHolder ph1 __dumb, const Index k) const { return x_.block(k, 0, 1, getXDim()); @@ -151,23 +151,23 @@ XYSampleData::ConstSampleBlock XYSampleData::x(const Index i, const Index k) return x_.block(k, i, 1, 1); } -XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __unused, - const PlaceHolder ph2 __unused) +XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __dumb, + const PlaceHolder ph2 __dumb) { isCovarianceInit_ = false; return y_.block(0, 0, getNData(), getYDim()); } -XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __unused, - const PlaceHolder ph2 __unused) +XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __dumb, + const PlaceHolder ph2 __dumb) const { return y_.block(0, 0, getNData(), getYDim()); } XYSampleData::SampleBlock XYSampleData::y(const Index j, - const PlaceHolder ph2 __unused) + const PlaceHolder ph2 __dumb) { isCovarianceInit_ = false; @@ -175,13 +175,13 @@ XYSampleData::SampleBlock XYSampleData::y(const Index j, } XYSampleData::ConstSampleBlock XYSampleData::y(const Index j, - const PlaceHolder ph2 __unused) + const PlaceHolder ph2 __dumb) const { return y_.block(0, j, getNData(), 1); } -XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __unused, +XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __dumb, const Index k) { isCovarianceInit_ = false; @@ -189,7 +189,7 @@ XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __unused, return y_.block(k, 0, 1, getYDim()); } -XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __unused, +XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __dumb, const Index k) const { return y_.block(k, 0, 1, getYDim()); diff --git a/lib/XYStatData.cpp b/lib/XYStatData.cpp index 1e0dc98..886826a 100644 --- a/lib/XYStatData.cpp +++ b/lib/XYStatData.cpp @@ -89,39 +89,39 @@ void XYStatData::reinitChi2(const bool doReinit) reinitChi2_ = doReinit; } -Block> XYStatData::x(const PlaceHolder ph1 __unused, - const PlaceHolder ph2 __unused) +Block> XYStatData::x(const PlaceHolder ph1 __dumb, + const PlaceHolder ph2 __dumb) { return x_.block(0, 0, getNData(), getXDim()); } -ConstBlock> XYStatData::x(const PlaceHolder ph1 __unused, - const PlaceHolder ph2 __unused) +ConstBlock> XYStatData::x(const PlaceHolder ph1 __dumb, + const PlaceHolder ph2 __dumb) const { return x_.block(0, 0, getNData(), getXDim()); } Block> XYStatData::x(const Index i, - const PlaceHolder ph2 __unused) + const PlaceHolder ph2 __dumb) { return x_.block(0, i, getNData(), 1); } ConstBlock> XYStatData::x(const Index i, - const PlaceHolder ph2 __unused) + const PlaceHolder ph2 __dumb) const { return x_.block(0, i, getNData(), 1); } -Block> XYStatData::x(const PlaceHolder ph1 __unused, +Block> XYStatData::x(const PlaceHolder ph1 __dumb, const Index k) { return x_.block(k, 0, 1, getXDim()); } -ConstBlock> XYStatData::x(const PlaceHolder ph1 __unused, +ConstBlock> XYStatData::x(const PlaceHolder ph1 __dumb, const Index k) const { return x_.block(k, 0, 1, getXDim()); @@ -137,38 +137,38 @@ const double & XYStatData::x(const Index i, const Index k) const return x_(k, i); } -Block> XYStatData::y(const PlaceHolder ph1 __unused, - const PlaceHolder ph2 __unused) +Block> XYStatData::y(const PlaceHolder ph1 __dumb, + const PlaceHolder ph2 __dumb) { return y_.block(0, 0, getNData(), getYDim()); } -ConstBlock> XYStatData::y(const PlaceHolder ph1 __unused, - const PlaceHolder ph2 __unused) +ConstBlock> XYStatData::y(const PlaceHolder ph1 __dumb, + const PlaceHolder ph2 __dumb) const { return y_.block(0, 0, getNData(), getYDim()); } Block> XYStatData::y(const Index j, - const PlaceHolder ph2 __unused) + const PlaceHolder ph2 __dumb) { return y_.block(0, j, getNData(), 1); } ConstBlock> XYStatData::y(const Index j, - const PlaceHolder ph2 __unused) + const PlaceHolder ph2 __dumb) const { return y_.block(0, j, getNData(), 1); } -Block> XYStatData::y(const PlaceHolder ph1 __unused, const Index k) +Block> XYStatData::y(const PlaceHolder ph1 __dumb, const Index k) { return y_.block(k, 0, 1, getYDim()); } -ConstBlock> XYStatData::y(const PlaceHolder ph1 __unused, +ConstBlock> XYStatData::y(const PlaceHolder ph1 __dumb, const Index k) const { return y_.block(k, 0, 1, getYDim());