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

refs #356 Removed CValueObject and expanded CValueObjectStdTuple to compensate.

Browse Source 
* Involves rearranging some header includes to break cyclic include dependencies,
* Adding a new, simple base class CEmpty,
* Removing any remaining polymorphic uses of CValueObject with templates,
* Adding a new trait for use with enable_if to restrict templates to work only with value objects,
* Replacing the polymorphic/runtime multimethod-based compare functions with static/compile-time compare functions.
This commit is contained in:
Mathew Sutcliffe
2015-03-16 18:37:05 +00:00
parent d878f879aa
commit 31c33b4b8d
17 changed files with 440 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/tuple_private.h
View File

@@ -25,8 +25,26 @@
namespace BlackMisc
{
class CValueObject;
class CEmpty;
template <class> class TupleConverter;
template <class Derived, class Base = CEmpty> class CValueObjectStdTuple;
//! Traits class to test whether a class template specialization is a base class of another class.
template <template <class...> class Base, class Derived>
class TemplateIsBaseOf
{
struct yes { char x; };
struct no { yes x[2]; };
template <class... Ts> static yes test(const Base<Ts...> &);
static no test(...);
public:
//! True if and only if Derived is derived from a specialization of Base.
static const bool value = sizeof(test(std::declval<Derived>())) == sizeof(yes);
//! std::true_type or std::false_type.
using type = std::integral_constant<bool, value>;
};
namespace Private
{
@@ -145,7 +163,7 @@ namespace BlackMisc
template <class Derived>
struct AttributeComparable<Derived, false, false>
{
template <class T> using isCValueObject = typename std::is_base_of<CValueObject, typename T::type>::type;
template <class T> using isCValueObject = typename std::is_base_of<CEmpty, T>::type; // FIXME use TemplateIsBaseOf
friend int compare(const Derived &a, const Derived &b) { return compareHelper(a.m_obj, b.m_obj, isCValueObject<Derived>()); }
friend bool operator ==(const Derived &a, const Derived &b) { return a.m_obj == b.m_obj; }
friend bool operator !=(const Derived &a, const Derived &b) { return a.m_obj != b.m_obj; }