fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

First stab at fixing #55

Browse Source
This commit is contained in:
Pavel Kirienko 2015-08-15 13:15:44 +03:00
parent f3931f7fc5
commit e32dfafbae
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libuavcan/include/uavcan/marshal/array.hpp
View File

@ -1085,16 +1085,23 @@ public:
typedef SizeType size_type;
};
/**
* These operators will only be enabled if rhs and lhs are different types. This precondition allows to work-around
* the ambiguity arising from the scope containing two definitions: one here and the others in Array<>.
* Refer to https://github.com/UAVCAN/libuavcan/issues/55 for more info.
*/
template <typename R, typename T, ArrayMode ArrayMode, unsigned MaxSize>
UAVCAN_EXPORT
inline bool operator==(const R& rhs, const Array<T, ArrayMode, MaxSize>& lhs)
inline typename EnableIf<!IsSameType<R, Array<T, ArrayMode, MaxSize> >::Result, bool>::Type
operator==(const R& rhs, const Array<T, ArrayMode, MaxSize>& lhs)
{
return lhs.operator==(rhs);
}
template <typename R, typename T, ArrayMode ArrayMode, unsigned MaxSize>
UAVCAN_EXPORT
inline bool operator!=(const R& rhs, const Array<T, ArrayMode, MaxSize>& lhs)
inline typename EnableIf<!IsSameType<R, Array<T, ArrayMode, MaxSize> >::Result, bool>::Type
operator!=(const R& rhs, const Array<T, ArrayMode, MaxSize>& lhs)
{
return lhs.operator!=(rhs);
}

15
libuavcan/include/uavcan/util/templates.hpp
View File

@ -91,6 +91,21 @@ struct UAVCAN_EXPORT Select<false, TrueType, FalseType>
typedef FalseType Result;
};
/**
* Checks if two identifiers refer to the same type.
*/
template<class T, class U>
struct IsSameType
{
enum { Result = 0 };
};
template <typename T>
struct IsSameType<T, T>
{
enum { Result = 1 };
};
/**
* Remove reference as in <type_traits>
*/