From e4e42f764d12b49c18088f6f12c388e8eee0a342 Mon Sep 17 00:00:00 2001 From: Lorenzo Moneta <Lorenzo.Moneta@cern.ch> Date: Fri, 6 Aug 2010 09:25:40 +0000 Subject: [PATCH] from Fons: apply patch to fix warnings observed in Clang git-svn-id: http://root.cern.ch/svn/root/trunk@34742 27541ba8-7e3a-0410-8455-c3a389f83636 --- math/smatrix/inc/Math/Dinv.h | 2 +- math/smatrix/inc/Math/HelperOps.h | 12 ++++++------ math/smatrix/inc/Math/MatrixRepresentationsStatic.h | 6 +++--- math/smatrix/test/testSMatrix.cxx | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/math/smatrix/inc/Math/Dinv.h b/math/smatrix/inc/Math/Dinv.h index cc4a7cb795c..5c79b542ac3 100644 --- a/math/smatrix/inc/Math/Dinv.h +++ b/math/smatrix/inc/Math/Dinv.h @@ -168,7 +168,7 @@ class Inverter<0> { public: /// template <class MatrixRep> - inline static bool Dinv(MatrixRep& rhs) { return true; } + inline static bool Dinv(MatrixRep&) { return true; } }; diff --git a/math/smatrix/inc/Math/HelperOps.h b/math/smatrix/inc/Math/HelperOps.h index a94a72de2eb..0374fb22d4c 100644 --- a/math/smatrix/inc/Math/HelperOps.h +++ b/math/smatrix/inc/Math/HelperOps.h @@ -123,8 +123,8 @@ namespace Math { template <class T, unsigned int D1, unsigned int D2, class A> struct Assign<T, D1, D2, A, MatRepSym<T,D1>, MatRepStd<T,D1,D2> > { - static void Evaluate(SMatrix<T,D1,D2,MatRepSym<T,D1> >& lhs, - const Expr<A,T,D1,D2,MatRepStd<T,D1,D2> >& rhs) + static void Evaluate(SMatrix<T,D1,D2,MatRepSym<T,D1> >&, + const Expr<A,T,D1,D2,MatRepStd<T,D1,D2> >&) { STATIC_CHECK(0==1, Cannot_assign_general_to_symmetric_matrix); } @@ -253,8 +253,8 @@ namespace Math { template <class T, unsigned int D1, unsigned int D2, class A> struct PlusEquals<T, D1, D2, A, MatRepSym<T,D1>, MatRepStd<T,D1,D2> > { - static void Evaluate(SMatrix<T,D1,D2,MatRepSym<T,D1> >& lhs, - const Expr<A,T,D1,D2,MatRepStd<T,D1,D2> >& rhs) + static void Evaluate(SMatrix<T,D1,D2,MatRepSym<T,D1> >&, + const Expr<A,T,D1,D2,MatRepStd<T,D1,D2> >&) { STATIC_CHECK(0==1, Cannot_plusEqual_general_to_symmetric_matrix); } @@ -337,8 +337,8 @@ namespace Math { template <class T, unsigned int D1, unsigned int D2, class A> struct MinusEquals<T, D1, D2, A, MatRepSym<T,D1>, MatRepStd<T,D1,D2> > { - static void Evaluate(SMatrix<T,D1,D2,MatRepSym<T,D1> >& lhs, - const Expr<A,T,D1,D2,MatRepStd<T,D1,D2> >& rhs) + static void Evaluate(SMatrix<T,D1,D2,MatRepSym<T,D1> >&, + const Expr<A,T,D1,D2,MatRepStd<T,D1,D2> >&) { STATIC_CHECK(0==1, Cannot_minusEqual_general_to_symmetric_matrix); } diff --git a/math/smatrix/inc/Math/MatrixRepresentationsStatic.h b/math/smatrix/inc/Math/MatrixRepresentationsStatic.h index bd84f9dbab1..ddc7f07373d 100644 --- a/math/smatrix/inc/Math/MatrixRepresentationsStatic.h +++ b/math/smatrix/inc/Math/MatrixRepresentationsStatic.h @@ -291,7 +291,7 @@ template<> assignment : only symmetric to symmetric allowed */ template <class R> - inline MatRepSym<T, D>& operator=(const R& rhs) { + inline MatRepSym<T, D>& operator=(const R&) { STATIC_CHECK(0==1, Cannot_assign_general_to_symmetric_matrix_representation); return *this; @@ -305,7 +305,7 @@ template<> self addition : only symmetric to symmetric allowed */ template <class R> - inline MatRepSym<T, D>& operator+=(const R& rhs) { + inline MatRepSym<T, D>& operator+=(const R&) { STATIC_CHECK(0==1, Cannot_add_general_to_symmetric_matrix_representation); return *this; @@ -319,7 +319,7 @@ template<> self subtraction : only symmetric to symmetric allowed */ template <class R> - inline MatRepSym<T, D>& operator-=(const R& rhs) { + inline MatRepSym<T, D>& operator-=(const R&) { STATIC_CHECK(0==1, Cannot_substract_general_to_symmetric_matrix_representation); return *this; diff --git a/math/smatrix/test/testSMatrix.cxx b/math/smatrix/test/testSMatrix.cxx index a9433f0dfb2..f595146fdf0 100644 --- a/math/smatrix/test/testSMatrix.cxx +++ b/math/smatrix/test/testSMatrix.cxx @@ -81,7 +81,7 @@ int test1() { #ifdef TEST_STATIC_CHECK // create a vector of size 2 from 3 arguments - SVector<float, 2> v(1,2,3); + SVector<float, 2> vbad(1,2,3); #endif // test STL interface -- GitLab