Fixed many MSVC warnings.

This commit is contained in:
Hauke Heibel 2010-06-09 09:30:22 +02:00
parent 50e43bc75a
commit 45d3b405eb
7 changed files with 28 additions and 10 deletions

View File

@ -55,7 +55,7 @@ void test_selfadjoint()
{ {
for(int i = 0; i < g_repeat ; i++) for(int i = 0; i < g_repeat ; i++)
{ {
EIGEN_UNUSED int s = ei_random<int>(1,20); int s = ei_random<int>(1,20); EIGEN_UNUSED_VARIABLE(s);
CALL_SUBTEST_1( selfadjoint(Matrix<float, 1, 1>()) ); CALL_SUBTEST_1( selfadjoint(Matrix<float, 1, 1>()) );
CALL_SUBTEST_2( selfadjoint(Matrix<float, 2, 2>()) ); CALL_SUBTEST_2( selfadjoint(Matrix<float, 2, 2>()) );

View File

@ -136,10 +136,12 @@ struct fft_fwd_proxy
int rows() const { return m_src.rows(); } int rows() const { return m_src.rows(); }
int cols() const { return m_src.cols(); } int cols() const { return m_src.cols(); }
protected: protected:
const T_SrcMat & m_src; const T_SrcMat & m_src;
T_FftIfc & m_ifc; T_FftIfc & m_ifc;
int m_nfft; int m_nfft;
private:
fft_fwd_proxy& operator=(const fft_fwd_proxy&);
}; };
template<typename T_SrcMat,typename T_FftIfc> template<typename T_SrcMat,typename T_FftIfc>
@ -152,10 +154,12 @@ struct fft_inv_proxy
int rows() const { return m_src.rows(); } int rows() const { return m_src.rows(); }
int cols() const { return m_src.cols(); } int cols() const { return m_src.cols(); }
protected: protected:
const T_SrcMat & m_src; const T_SrcMat & m_src;
T_FftIfc & m_ifc; T_FftIfc & m_ifc;
int m_nfft; int m_nfft;
private:
fft_inv_proxy& operator=(const fft_inv_proxy&);
}; };

View File

@ -86,9 +86,11 @@ struct ei_intersector_helper2
bool intersectObject(const Object2 &obj) { return intersector.intersectObjectObject(stored, obj); } bool intersectObject(const Object2 &obj) { return intersector.intersectObjectObject(stored, obj); }
Object1 stored; Object1 stored;
Intersector &intersector; Intersector &intersector;
private:
ei_intersector_helper2& operator=(const ei_intersector_helper2&);
}; };
/** Given two BVH's, runs the query on their cartesian product encapsulated by \a intersector. /** Given two BVH's, runs the query on their Cartesian product encapsulated by \a intersector.
* The Intersector type must provide the following members: \code * The Intersector type must provide the following members: \code
bool intersectVolumeVolume(const BVH1::Volume &v1, const BVH2::Volume &v2) //returns true if product of volumes intersects the query bool intersectVolumeVolume(const BVH1::Volume &v1, const BVH2::Volume &v2) //returns true if product of volumes intersects the query
bool intersectVolumeObject(const BVH1::Volume &v1, const BVH2::Object &o2) //returns true if the volume-object product intersects the query bool intersectVolumeObject(const BVH1::Volume &v1, const BVH2::Object &o2) //returns true if the volume-object product intersects the query
@ -207,6 +209,8 @@ struct ei_minimizer_helper1
Scalar minimumOnObject(const Object1 &obj) { return minimizer.minimumOnObjectObject(obj, stored); } Scalar minimumOnObject(const Object1 &obj) { return minimizer.minimumOnObjectObject(obj, stored); }
Object2 stored; Object2 stored;
Minimizer &minimizer; Minimizer &minimizer;
private:
ei_minimizer_helper1& operator=(const ei_minimizer_helper1&) {}
}; };
template<typename Volume2, typename Object2, typename Object1, typename Minimizer> template<typename Volume2, typename Object2, typename Object1, typename Minimizer>

View File

@ -124,6 +124,8 @@ private:
Index ncfail; Index ncfail;
Scalar actred, prered; Scalar actred, prered;
FVectorType wa1, wa2, wa3, wa4; FVectorType wa1, wa2, wa3, wa4;
HybridNonLinearSolver& operator=(const HybridNonLinearSolver&);
}; };

View File

@ -133,6 +133,8 @@ private:
Scalar delta; Scalar delta;
Scalar ratio; Scalar ratio;
Scalar pnorm, xnorm, fnorm1, actred, dirder, prered; Scalar pnorm, xnorm, fnorm1, actred, dirder, prered;
LevenbergMarquardt& operator=(const LevenbergMarquardt&);
}; };
template<typename FunctorType, typename Scalar> template<typename FunctorType, typename Scalar>

View File

@ -130,6 +130,8 @@ public:
} }
private: private:
Scalar epsfcn; Scalar epsfcn;
NumericalDiff& operator=(const NumericalDiff&);
}; };
//vim: ai ts=4 sts=4 et sw=4 //vim: ai ts=4 sts=4 et sw=4

View File

@ -8,6 +8,10 @@
#include "main.h" #include "main.h"
#include <unsupported/Eigen/NonLinearOptimization> #include <unsupported/Eigen/NonLinearOptimization>
// This disables some useless Warnings on MSVC.
// It is intended to be done for this test only.
#include <Eigen/src/Core/util/DisableMSVCWarnings.h>
int fcn_chkder(const VectorXd &x, VectorXd &fvec, MatrixXd &fjac, int iflag) int fcn_chkder(const VectorXd &x, VectorXd &fvec, MatrixXd &fjac, int iflag)
{ {
/* subroutine fcn for chkder example. */ /* subroutine fcn for chkder example. */