From: Axel R. <ro...@us...> - 2012-08-28 22:00:47
|
Update of /cvsroot/sdif/Easdif/easdif In directory vz-cvs-3.sog:/tmp/cvs-serv20122/easdif Modified Files: sdif_matrix.hpp Log Message: Renamed function arguments to avoid compiler warnings in swig python interface. Index: sdif_matrix.hpp =================================================================== RCS file: /cvsroot/sdif/Easdif/easdif/sdif_matrix.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** sdif_matrix.hpp 3 Jan 2012 23:59:25 -0000 1.8 --- sdif_matrix.hpp 28 Aug 2012 22:00:44 -0000 1.9 *************** *** 37,40 **** --- 37,43 ---- * * $Log$ + * Revision 1.9 2012/08/28 22:00:44 roebel + * Renamed function arguments to avoid compiler warnings in swig python interface. + * * Revision 1.8 2012/01/03 23:59:25 roebel * Changed SetRow(std::vector and SetCol(const std::vector into template member functions and add exception if inout vector size *************** *** 735,745 **** template <class VECVAL_T> void ! SetRow(const std::vector<VECVAL_T> &in,int irow) throw (SDIFArrayPosition) { ! if(static_cast<int>(in.size()) != GetNbCols()) throw SDIFArrayPosition(eError, "Error in SDIFMatrix::SetRow!!! vector size of input vector does not match number of columns !!!", 0, eArrayPosition,__FILE__,__LINE__); ! mInter->SetRow(&(in[0]),irow); return; } --- 738,748 ---- template <class VECVAL_T> void ! SetRow(const std::vector<VECVAL_T> &inVec,int irow) throw (SDIFArrayPosition) { ! if(static_cast<int>(inVec.size()) != GetNbCols()) throw SDIFArrayPosition(eError, "Error in SDIFMatrix::SetRow!!! vector size of input vector does not match number of columns !!!", 0, eArrayPosition,__FILE__,__LINE__); ! mInter->SetRow(&(inVec[0]),irow); return; } *************** *** 769,779 **** template <class VECVAL_T> void ! SetCol(const std::vector<VECVAL_T> &in,int icol) throw (SDIFArrayPosition) { ! if(static_cast<int>(in.size()) != GetNbRows()){ throw SDIFArrayPosition(eError, "Error in SDIFMatrix::SetCol:: vector size of input vector does not match number of rows !!!", 0, eArrayPosition,__FILE__,__LINE__); } ! mInter->SetCol(&(in[0]),icol); } }; --- 772,782 ---- template <class VECVAL_T> void ! SetCol(const std::vector<VECVAL_T> &inVec, int icol) throw (SDIFArrayPosition) { ! if(static_cast<int>(inVec.size()) != GetNbRows()){ throw SDIFArrayPosition(eError, "Error in SDIFMatrix::SetCol:: vector size of input vector does not match number of rows !!!", 0, eArrayPosition,__FILE__,__LINE__); } ! mInter->SetCol(&(inVec[0]),icol); } }; |