ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

utilty: fixed generic vector for clang

Browse Source
This commit is contained in:
Eberhard Graether
2014-06-30 23:29:58 +02:00
parent ff3ddcca2a
commit 324dff80a8
4 changed files with 78 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/math/Vector2.h
+13 -13
View File
@@ -4,7 +4,7 @@
#include "utility/logging/logging.h"
#include "utility/Property.h"
#include "VectorBase.h"
#include "utility/math/VectorBase.h"
template<class T>
class Vector2 : public VectorBase<T, 2>
@@ -37,18 +37,18 @@ protected:
template<class T>
Vector2<T>::Vector2()
: VectorBase<T, 2>()
, x(&m_values[m_xIndex])
, y(&m_values[m_yIndex])
, x(&VectorBase<T, 2>::m_values[m_xIndex])
, y(&VectorBase<T, 2>::m_values[m_yIndex])
{
setValue(m_xIndex, 0);
setValue(m_yIndex, 0);
setValue(m_xIndex, 0);
setValue(m_yIndex, 0);
}
template<class T>
Vector2<T>::Vector2(const T& x, const T& y)
: VectorBase<T, 2>()
, x(&m_values[m_xIndex])
, y(&m_values[m_yIndex])
, x(&VectorBase<T, 2>::m_values[m_xIndex])
, y(&VectorBase<T, 2>::m_values[m_yIndex])
{
setValue(m_xIndex, x);
setValue(m_yIndex, y);
@@ -57,8 +57,8 @@ Vector2<T>::Vector2(const T& x, const T& y)
template<class T>
Vector2<T>::Vector2(const VectorBase<T, 2>& vector)
: VectorBase<T, 2>(vector)
, x(&m_values[m_xIndex])
, y(&m_values[m_yIndex])
, x(&VectorBase<T, 2>::m_values[m_xIndex])
, y(&VectorBase<T, 2>::m_values[m_yIndex])
{
}
@@ -74,7 +74,7 @@ T Vector2<T>::getValue(const unsigned int index) const
{
return VectorBase<T, 2>::getValue(index);
}
catch(std::exception& e)
catch (std::exception& e)
{
LOG_ERROR(e.what());
return 0;
@@ -88,7 +88,7 @@ void Vector2<T>::setValue(const unsigned int index, const T& value)
{
VectorBase<T, 2>::setValue(index, value);
}
catch(std::exception& e)
catch (std::exception& e)
{
LOG_ERROR(e.what());
}
@@ -99,9 +99,9 @@ T& Vector2<T>::operator[](const unsigned int index)
{
try
{
return VectorBase<T, 2>::[index];
return VectorBase<T, 2>::getValue(index);
}
catch(std::exception& e)
catch (std::exception& e)
{
LOG_ERROR(e.what());
return 0;