Commit c8e7b188 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[FIX] - fixed several prior minor merge errors

parent 6dd6d2e9
......@@ -598,7 +598,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator==( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator==( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl == right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -608,7 +611,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator==( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right );
friend inline bool operator==( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl == right;
}
/**
* Wrapper around std::vector operator
......@@ -618,7 +624,11 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator==( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator==( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left == right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -628,7 +638,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator!=( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator!=( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl != right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -638,7 +651,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator!=( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right );
friend inline bool operator!=( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl != right;
}
/**
* Wrapper around std::vector operator
......@@ -648,7 +664,11 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator!=( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator!=( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left != right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -658,7 +678,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator<( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator<( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl < right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -668,7 +691,11 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator<( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right );
friend inline bool operator<( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl < right;
}
/**
* Wrapper around std::vector operator
*
......@@ -677,7 +704,11 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator<( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator<( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left < right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -687,7 +718,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator >( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator >( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl > right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -697,7 +731,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator >( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right );
friend inline bool operator >( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl > right;
}
/**
* Wrapper around std::vector operator
......@@ -707,7 +744,11 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator >( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator >( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left > right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -717,7 +758,11 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator<=( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator<=( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl <= right._impl;
}
/**
* Wrapper around std::vector operator
*
......@@ -726,7 +771,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator<=( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right );
friend inline bool operator<=( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl <= right;
}
/**
* Wrapper around std::vector operator
......@@ -736,7 +784,11 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator<=( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator<=( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left <= right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -746,7 +798,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator>=( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator>=( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl >= right._impl;
}
/**
* Wrapper around std::vector operator
......@@ -756,7 +811,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator>=( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right );
friend inline bool operator>=( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl >= right;
}
/**
* Wrapper around std::vector operator
......@@ -766,7 +824,10 @@ public:
*
* \return True if and only if std::vector operator is true
*/
friend inline bool operator>=( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right );
friend inline bool operator>=( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left >= right._impl;
}
private:
/**
......@@ -823,112 +884,4 @@ template< class ValueT > inline std::ostream& operator<<( std::ostream& os, cons
return os;
}
template< class ValueT >
inline bool operator==( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl == right._impl;
}
template< class ValueT >
inline bool operator==( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl == right;
}
template< class ValueT >
inline bool operator==( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left == right._impl;
}
template< class ValueT >
inline bool operator!=( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl != right._impl;
}
template< class ValueT >
inline bool operator!=( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl != right;
}
template< class ValueT >
inline bool operator!=( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left != right._impl;
}
template< class ValueT >
inline bool operator<( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl < right._impl;
}
template< class ValueT >
inline bool operator<( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl < right;
}
template< class ValueT >
inline bool operator<( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left < right._impl;
}
template< class ValueT >
inline bool operator >( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl > right._impl;
}
template< class ValueT >
inline bool operator >( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl > right;
}
template< class ValueT >
inline bool operator >( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left > right._impl;
}
template< class ValueT >
inline bool operator<=( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl <= right._impl;
}
template< class ValueT >
inline bool operator<=( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl <= right;
}
template< class ValueT >
inline bool operator<=( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left <= right._impl;
}
template< class ValueT >
inline bool operator>=( const WMixinVector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left._impl >= right._impl;
}
template< class ValueT >
inline bool operator>=( const WMixinVector< ValueT >& left, const std::vector< ValueT >& right )
{
return left._impl >= right;
}
template< class ValueT >
inline bool operator>=( const std::vector< ValueT >& left, const WMixinVector< ValueT >& right )
{
return left >= right._impl;
}
#endif // WMIXINVECTOR_H
......@@ -28,14 +28,15 @@
#include <map>
#include <string>
#include "../WExportCommon.h"
#include "../WTransferable.h"
#include "../WColor.h"
#include "../WExportCommon.h"
/**
* Represents a std::map where for each vertex ID a color is stored.
*/
class OWCOMMON_EXPORT WColoredVertices : public WTransferable
class OWCOMMON_EXPORT WColoredVertices : public WTransferable // NOLINT
{
public:
/**
......
......@@ -1130,7 +1130,7 @@ private:
* \tparam Data_T The datatype of the components, double by default.
*/
//next line is nolint because brainlint cannot find the declaration of TensorBase_T
template< template< size_t, size_t, typename > class TensorBase_T, size_t order, size_t dim, typename Data_T > //NOLINT
template< template< std::size_t, std::size_t, typename > class TensorBase_T, std::size_t order, std::size_t dim, typename Data_T > //NOLINT
class WTensorFunc : public TensorBase_T< order, dim, Data_T >
{
};
......@@ -1143,7 +1143,7 @@ class WTensorFunc : public TensorBase_T< order, dim, Data_T >
* in each direction.
* \tparam Data_T The datatype of the components, double by default.
*/
template< template< size_t, size_t, typename > class TensorBase_T, size_t dim, typename Data_T > //NOLINT
template< template< std::size_t, std::size_t, typename > class TensorBase_T, std::size_t dim, typename Data_T > //NOLINT
class WTensorFunc< TensorBase_T, 6, dim, Data_T > : public TensorBase_T< 6, dim, Data_T >
{
public:
......@@ -1159,7 +1159,7 @@ public:
*
* \return A reference to the element.
*/
Data_T& operator() ( size_t i0, size_t i1, size_t i2, size_t i3, size_t i4, size_t i5 );
Data_T& operator() ( std::size_t i0, std::size_t i1, std::size_t i2, std::size_t i3, std::size_t i4, std::size_t i5 );
/**
* Access operator.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment