X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40e01f4bfae3018984d947e07efc7a7c624a6eda..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/meta/movable.h?ds=inline diff --git a/include/wx/meta/movable.h b/include/wx/meta/movable.h index 3583c98a59..a962282c42 100644 --- a/include/wx/meta/movable.h +++ b/include/wx/meta/movable.h @@ -11,20 +11,9 @@ #ifndef _WX_META_MOVABLE_H_ #define _WX_META_MOVABLE_H_ -#include "wx/defs.h" +#include "wx/meta/pod.h" #include "wx/string.h" // for wxIsMovable specialization -// This macro declares something called "value" inside a class declaration. -// -// It has to be used because VC6 doesn't handle initialization of the static -// variables in the class declaration itself while BCC5.82 doesn't understand -// enums (it compiles the template fine but can't use it later) -#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7) - #define wxDEFINE_TEMPLATE_BOOL_VALUE(val) enum { value = val } -#else - #define wxDEFINE_TEMPLATE_BOOL_VALUE(val) static const bool value = val -#endif - // Helper to decide if an object of type T is "movable", i.e. if it can be // copied to another memory location using memmove() or realloc() C functions. // C++ only gurantees that POD types (including primitive types) are @@ -32,7 +21,7 @@ template struct wxIsMovable { - wxDEFINE_TEMPLATE_BOOL_VALUE(false); + wxDEFINE_TEMPLATE_BOOL_VALUE(wxIsPod::value); }; // Macro to add wxIsMovable specialization for given type that marks it @@ -43,52 +32,13 @@ struct wxIsMovable wxDEFINE_TEMPLATE_BOOL_VALUE(true); \ }; -WX_DECLARE_TYPE_MOVABLE(bool) -WX_DECLARE_TYPE_MOVABLE(unsigned char) -WX_DECLARE_TYPE_MOVABLE(signed char) -WX_DECLARE_TYPE_MOVABLE(unsigned int) -WX_DECLARE_TYPE_MOVABLE(signed int) -WX_DECLARE_TYPE_MOVABLE(unsigned short int) -WX_DECLARE_TYPE_MOVABLE(signed short int) -WX_DECLARE_TYPE_MOVABLE(signed long int) -WX_DECLARE_TYPE_MOVABLE(unsigned long int) -WX_DECLARE_TYPE_MOVABLE(float) -WX_DECLARE_TYPE_MOVABLE(double) -WX_DECLARE_TYPE_MOVABLE(long double) -#if wxWCHAR_T_IS_REAL_TYPE -WX_DECLARE_TYPE_MOVABLE(wchar_t) -#endif -#ifdef wxLongLong_t -WX_DECLARE_TYPE_MOVABLE(wxLongLong_t) -WX_DECLARE_TYPE_MOVABLE(wxULongLong_t) -#endif - -// Visual C++ 6.0 can't compile partial template specializations and as this is -// only an optimization, we can live with pointers not being recognized as -// movable types under VC6 -#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7) - -// pointers are movable: -template -struct wxIsMovable -{ - static const bool value = true; -}; - -template -struct wxIsMovable -{ - static const bool value = true; -}; - -#endif // !VC++ < 7 - // Our implementation of wxString is written in such way that it's safe to move -// it around. OTOH, we don't know anything about std::string. +// it around (unless position cache is used which unfortunately breaks this). +// OTOH, we don't know anything about std::string. // (NB: we don't put this into string.h and choose to include wx/string.h from // here instead so that rarely-used wxIsMovable code isn't included by // everything) -#if !wxUSE_STL +#if !wxUSE_STD_STRING && !wxUSE_STRING_POS_CACHE WX_DECLARE_TYPE_MOVABLE(wxString) #endif