Skip to content

Commit

Permalink
Merge pull request #1017 from lairworks/removeOldDelegateHacks
Browse files Browse the repository at this point in the history 
Remove old `#if` hacks for older compilers from `Delegate`
  • Loading branch information
@DanRStevens
DanRStevens authored Dec 13, 2021
2 parents d026af0 + 2f02cae commit 533279c
Showing 1 changed file with 0 additions and 120 deletions.
120 changes: 0 additions & 120 deletions NAS2D/Signal/Delegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,36 +28,17 @@
#include <cstring>


#define FASTDELEGATE_USESTATICFUNCTIONHACK

// Compiler identification. It's not easy to identify Visual C++ because many vendors
// fraudulently define Microsoft's identifiers.
#if defined(_MSC_VER) && !defined(__MWERKS__) && !defined(__VECTOR_C) && !defined(__ICL) && !defined(__BORLANDC__)
#define FASTDLGT_ISMSVC
#define FASTDLGT_MICROSOFT_MFP
#define FASTDLGT_HASINHERITANCE_KEYWORDS
#endif

// Does it allow function declarator syntax? The following compilers are known to work:
#if defined(FASTDLGT_ISMSVC) && (_MSC_VER >= 1310) // VC 7.1
#define FASTDELEGATE_ALLOW_FUNCTION_TYPE_SYNTAX
#endif

// Gcc(2.95+), and versions of Digital Mars, Intel and Comeau in common use.
#if defined(__DMC__) || defined(__GNUC__) || defined(__ICL) || defined(__COMO__)
#define FASTDELEGATE_ALLOW_FUNCTION_TYPE_SYNTAX
#endif

#ifdef __GNUC__ // Workaround GCC bug #8271
#define FASTDELEGATE_GCC_BUG_8271
#endif

namespace NAS2D
{

namespace detail
{

template <typename OutputClass, typename InputClass>
union horrible_union
{
Expand Down Expand Up @@ -123,10 +104,7 @@ namespace NAS2D
// GenericClass is a fake class, ONLY used to provide a type. It is vitally important
// that it is never defined.
#ifdef FASTDLGT_MICROSOFT_MFP

#ifdef FASTDLGT_HASINHERITANCE_KEYWORDS
class __single_inheritance GenericClass;
#endif
class GenericClass {};
#else
class GenericClass;
Expand Down Expand Up @@ -232,9 +210,6 @@ namespace NAS2D
};


#if (_MSC_VER <1300)
#error Support for this compiler is no longer provided. Please upgrade.
#else
template <>
struct SimplifyMemFunc<SINGLE_MEMFUNCPTR_SIZE + 3 * sizeof(int)>
{
Expand Down Expand Up @@ -266,7 +241,6 @@ namespace NAS2D
};
};
#endif
#endif
}


Expand All @@ -277,26 +251,7 @@ namespace NAS2D
detail::GenericClass* m_pthis;
GenericMemFuncType m_pFunction;

#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
using GenericFuncPtr = void (*)();
GenericFuncPtr m_pStaticFunction;
#endif

public:
#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
DelegateMemento() :
m_pthis(nullptr),
m_pFunction(nullptr),
m_pStaticFunction(nullptr),
{}

void clear()
{
m_pthis = nullptr;
m_pFunction = nullptr;
m_pStaticFunction = nullptr;
}
#else
DelegateMemento() :
m_pthis(nullptr),
m_pFunction(nullptr)
Expand All @@ -307,33 +262,13 @@ namespace NAS2D
m_pthis = nullptr;
m_pFunction = nullptr;
}
#endif
public:
#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
inline bool IsEqual(const DelegateMemento& x) const
{
if (m_pFunction != x.m_pFunction) return false;
if (m_pStaticFunction != x.m_pStaticFunction) return false;
if (m_pStaticFunction)
{
return m_pthis == x.m_pthis;
}
else
{
return true;
}
}
#else
inline bool IsEqual(const DelegateMemento& x) const
{
return m_pthis == x.m_pthis && m_pFunction == x.m_pFunction;
}
#endif
inline bool IsLess(const DelegateMemento& right) const
{
#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
if (m_pStaticFunction || right.m_pStaticFunction) return m_pStaticFunction < right.m_pStaticFunction;
#endif
if (m_pthis != right.m_pthis) return m_pthis < right.m_pthis;

return memcmp(&m_pFunction, &right.m_pFunction, sizeof(m_pFunction)) < 0;
Expand All @@ -355,19 +290,13 @@ namespace NAS2D
DelegateMemento(const DelegateMemento& right) :
m_pthis(right.m_pthis),
m_pFunction(right.m_pFunction)
#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
, m_pStaticFunction(right.m_pStaticFunction)
#endif
{}

protected:
void SetMementoFrom(const DelegateMemento& right)
{
m_pFunction = right.m_pFunction;
m_pthis = right.m_pthis;
#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
m_pStaticFunction = right.m_pStaticFunction;
#endif
}
};

Expand All @@ -382,30 +311,13 @@ namespace NAS2D
inline void bindmemfunc(X* pthis, XMemFunc function_to_bind)
{
m_pthis = SimplifyMemFunc<sizeof(function_to_bind)>::Convert(pthis, function_to_bind, m_pFunction);
#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
m_pStaticFunction = nullptr;
#endif
}

template <typename X, typename XMemFunc>
inline void bindconstmemfunc(const X* pthis, XMemFunc function_to_bind)
{
m_pthis = SimplifyMemFunc<sizeof(function_to_bind)>::Convert(const_cast<X*>(pthis), function_to_bind, m_pFunction);
#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
m_pStaticFunction = nullptr;
#endif
}

#ifdef FASTDELEGATE_GCC_BUG_8271 // At present, GCC doesn't recognize constness of MFPs in templates
template <typename X, typename XMemFunc>
inline void bindmemfunc(const X* pthis, XMemFunc function_to_bind)
{
bindconstmemfunc(pthis, function_to_bind);
#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)
m_pStaticFunction = nullptr;
#endif
}
#endif

inline GenericClass* GetClosureThis() const
{
Expand All @@ -417,32 +329,6 @@ namespace NAS2D
return CastMemFuncPtr<GenericMemFunc>(m_pFunction);
}

#if !defined(FASTDELEGATE_USESTATICFUNCTIONHACK)

public:
template <typename DerivedClass>
inline void CopyFrom(DerivedClass* pParent, const DelegateMemento& x)
{
SetMementoFrom(x);
if (m_pStaticFunction) m_pthis = reinterpret_cast<GenericClass*>(pParent);
}

template <typename DerivedClass, typename ParentInvokerSig>
inline void bindstaticfunc(DerivedClass* pParent, ParentInvokerSig static_function_invoker, StaticFuncPtr function_to_bind)
{
if (!function_to_bind)
{
m_pFunction = nullptr;
}
else
{
bindmemfunc(pParent, static_function_invoker);
}
m_pStaticFunction = reinterpret_cast<GenericFuncPtr>(function_to_bind);
}
inline UnvoidStaticFuncPtr GetStaticFunction() const { return reinterpret_cast<UnvoidStaticFuncPtr>(m_pStaticFunction); }
#else

template <typename DerivedClass>
inline void CopyFrom(DerivedClass*, const DelegateMemento& right)
{
Expand All @@ -469,7 +355,6 @@ namespace NAS2D
static_assert(sizeof(UnvoidStaticFuncPtr) != sizeof(this), "Can't use evil method");
return horrible_cast<UnvoidStaticFuncPtr>(this);
}
#endif

inline bool IsEqualToStaticFuncPtr(StaticFuncPtr funcptr)
{
Expand All @@ -483,7 +368,6 @@ namespace NAS2D
}
}
};

}


Expand Down Expand Up @@ -588,8 +472,6 @@ namespace NAS2D
};


#ifdef FASTDELEGATE_ALLOW_FUNCTION_TYPE_SYNTAX

template <typename Signature>
class Delegate;

Expand Down Expand Up @@ -623,8 +505,6 @@ namespace NAS2D
}
};

#endif

template <typename X, typename Y, typename RetType, typename... Params>
DelegateX<RetType, Params...> MakeDelegate(Y* x, RetType (X::*func)(Params...))
{
Expand Down

0 comments on commit 533279c

Please sign in to comment.