flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #92 fixing warnings when compiling for 64bits due to conversions between size_t and int

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-02-07 22:45:35 +00:00
parent 07879cf5a7
commit 0a6030f5df
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/mathmatrixbase.cpp
View File

@@ -16,7 +16,7 @@ namespace BlackMisc
/*
* Get element by column / row
*/
template<class ImplMatrix, int Rows, int Columns> double CMatrixBase<ImplMatrix, Rows, Columns>::getElement(size_t row, size_t column) const
template<class ImplMatrix, int Rows, int Columns> double CMatrixBase<ImplMatrix, Rows, Columns>::getElement(int row, int column) const
{
this->checkRange(row, column);
return this->m_matrix(row, column);
@@ -25,7 +25,7 @@ namespace BlackMisc
/*
* Set element by column / row
*/
template<class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::setElement(size_t row, size_t column, double value)
template<class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::setElement(int row, int column, double value)
{
this->checkRange(row, column);
this->m_matrix(row, column) = value;
@@ -34,7 +34,7 @@ namespace BlackMisc
/*
* Check range
*/
template<class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::checkRange(size_t row, size_t column) const
template<class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::checkRange(int row, int column) const
{
bool valid = (row < Rows && column < Columns);
Q_ASSERT_X(valid, "getElement()", "Row or column invalid");

10
src/blackmisc/mathmatrixbase.h
View File

@@ -324,7 +324,7 @@ namespace BlackMisc
* \param column
* \return
*/
double getElement(size_t row, size_t column) const;
double getElement(int row, int column) const;
/*!
* \brief Get element
@@ -332,7 +332,7 @@ namespace BlackMisc
* \param column
* \param value
*/
void setElement(size_t row, size_t column, double value);
void setElement(int row, int column, double value);
/*!
* \brief Get element by operator () modifying
@@ -340,7 +340,7 @@ namespace BlackMisc
* \param column
* \return
*/
double &operator()(size_t row, size_t column)
double &operator()(int row, int column)
{
this->checkRange(row, column);
return this->m_matrix(row, column);
@@ -352,7 +352,7 @@ namespace BlackMisc
* \param column
* \return
*/
double operator()(size_t row, size_t column) const
double operator()(int row, int column) const
{
return this->getElement(row, column);
}
@@ -369,7 +369,7 @@ namespace BlackMisc
* \param column
* \throws std::range_error if index out of bounds
*/
void checkRange(size_t row, size_t column) const;
void checkRange(int row, int column) const;
};
} // namespace

6
src/blackmisc/mathvector3dbase.cpp
View File

@@ -81,7 +81,7 @@ namespace BlackMisc
/*
* Element (return by reference)
*/
template <class ImplVector> double &CVector3DBase<ImplVector>::getElement(size_t row)
template <class ImplVector> double &CVector3DBase<ImplVector>::getElement(int row)
{
switch (row)
{
@@ -100,7 +100,7 @@ namespace BlackMisc
/*
* Element
*/
template <class ImplVector> double CVector3DBase<ImplVector>::getElement(size_t row) const
template <class ImplVector> double CVector3DBase<ImplVector>::getElement(int row) const
{
return const_cast<CVector3DBase<ImplVector>*>(this)->getElement(row);
}
@@ -108,7 +108,7 @@ namespace BlackMisc
/*
* Set given element
*/
template <class ImplVector> void CVector3DBase<ImplVector>::setElement(size_t row, double value)
template <class ImplVector> void CVector3DBase<ImplVector>::setElement(int row, double value)
{
switch (row)
{

10
src/blackmisc/mathvector3dbase.h
View File

@@ -71,7 +71,7 @@ namespace BlackMisc
* \param row
* \return Mutable reference
*/
double &getElement(size_t row);
double &getElement(int row);
/*!
* \brief String for converter
@@ -152,28 +152,28 @@ namespace BlackMisc
* \param row
* \return
*/
double getElement(size_t row) const;
double getElement(int row) const;
/*!
* \brief Set element
* \param row
* \param value
*/
void setElement(size_t row, double value);
void setElement(int row, double value);
/*!
* \brief Operator []
* \param row
* \return
*/
double operator[](size_t row) const { return this->getElement(row); }
double operator[](int row) const { return this->getElement(row); }
/*!
* \brief Operator []
* \param row
* \return Mutable reference
*/
double &operator[](size_t row) { return this->getElement(row); }
double &operator[](int row) { return this->getElement(row); }
/*!
* \brief Equal operator ==