Remove our own implementation of std::is_convertible

Just use the standard trait instead.
This commit is contained in:
Vadim Zeitlin 2022-10-10 20:56:02 +02:00
parent d517a48c31
commit f99e02267a

View file

@ -10,35 +10,19 @@
#ifndef _WX_META_CONVERTIBLE_H_
#define _WX_META_CONVERTIBLE_H_
//
// Introduce an extra class to make this header compilable with g++3.2
//
template <class D, class B>
struct wxConvertibleTo_SizeHelper
{
static char Match(B* pb);
static int Match(...);
};
#include <type_traits>
// NOTE: this class is obsolete and provided only for compatibility, please use
// the standard class instead.
//
// Helper to decide if an object of type D is convertible to type B (the test
// succeeds in particular when D derives from B)
template <class D, class B>
struct wxConvertibleTo
{
enum
{
value =
sizeof(wxConvertibleTo_SizeHelper<D,B>::Match(static_cast<D*>(NULL)))
==
sizeof(char)
};
};
using wxConvertibleTo = std::is_convertible<D*, B*>;
// This is similar to wxConvertibleTo, except that when using a C++11 compiler,
// the case of D deriving from B non-publicly will be detected and the correct
// value (false) will be deduced instead of getting a compile-time error as
// with wxConvertibleTo. For pre-C++11 compilers there is no difference between
// this helper and wxConvertibleTo.
// This is similar to wxConvertibleTo, except that the case of D deriving from
// B non-publicly will be detected and the correct value (false) will be
// deduced.
template <class D, class B>
struct wxIsPubliclyDerived
{