cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simply varargs type checking by adding subtypes to check mask.

Browse Source 
Instead of always declaraing that a C++ type corresponds to either
Arg_String or Arg_Pointer, make Arg_String superset of Arg_Pointer.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2010-07-03 14:24:06 +00:00
parent 2d8d109b6c
commit 5b4a88f4db
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/wx/strvararg.h
View File

@ -151,12 +151,14 @@ public:
: m_wchar(str), m_str(NULL), m_cstr(NULL) {} : m_wchar(str), m_str(NULL), m_cstr(NULL) {}
// Possible argument types. These are or-combinable for wxASSERT_ARG_TYPE // Possible argument types. These are or-combinable for wxASSERT_ARG_TYPE
// convenience. // convenience. Some of the values are or-combined with another value, this
// expresses "supertypes" for use with wxASSERT_ARG_TYPE masks. For example,
// a char* string is also a pointer and an integer is also a char.
enum ArgumentType enum ArgumentType
{ {
Arg_Char = 0x0001, // character as char %c Arg_Char = 0x0001, // character as char %c
Arg_Pointer = 0x0002, // %p Arg_Pointer = 0x0002, // %p
Arg_String = 0x0004, // any form of string Arg_String = 0x0004 | Arg_Pointer, // any form of string (%s and %p too)
Arg_Int = 0x0008, Arg_Int = 0x0008,
#if SIZEOF_INT == SIZEOF_LONG #if SIZEOF_INT == SIZEOF_LONG
@ -414,14 +416,14 @@ wxFORMAT_STRING_SPECIFIER(signed char, wxFormatString::Arg_Char | wxFormatString
wxFORMAT_STRING_SPECIFIER(unsigned char, wxFormatString::Arg_Char | wxFormatString::Arg_Int) wxFORMAT_STRING_SPECIFIER(unsigned char, wxFormatString::Arg_Char | wxFormatString::Arg_Int)
#endif #endif
wxFORMAT_STRING_SPECIFIER(char*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(char*, wxFormatString::Arg_String)
wxFORMAT_STRING_SPECIFIER(unsigned char*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(unsigned char*, wxFormatString::Arg_String)
wxFORMAT_STRING_SPECIFIER(signed char*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(signed char*, wxFormatString::Arg_String)
wxFORMAT_STRING_SPECIFIER(const char*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(const char*, wxFormatString::Arg_String)
wxFORMAT_STRING_SPECIFIER(const unsigned char*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(const unsigned char*, wxFormatString::Arg_String)
wxFORMAT_STRING_SPECIFIER(const signed char*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(const signed char*, wxFormatString::Arg_String)
wxFORMAT_STRING_SPECIFIER(wchar_t*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(wchar_t*, wxFormatString::Arg_String)
wxFORMAT_STRING_SPECIFIER(const wchar_t*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(const wchar_t*, wxFormatString::Arg_String)
wxFORMAT_STRING_SPECIFIER(int*, wxFormatString::Arg_IntPtr | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(int*, wxFormatString::Arg_IntPtr | wxFormatString::Arg_Pointer)
wxFORMAT_STRING_SPECIFIER(short int*, wxFormatString::Arg_ShortIntPtr | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(short int*, wxFormatString::Arg_ShortIntPtr | wxFormatString::Arg_Pointer)
@ -503,8 +505,7 @@ struct wxArgNormalizerWithBuffer
unsigned index) unsigned index)
: m_value(buf) : m_value(buf)
{ {
wxASSERT_ARG_TYPE( fmt, index, wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String );
wxFormatString::Arg_String | wxFormatString::Arg_Pointer );
} }
const CharType *get() const { return m_value; } const CharType *get() const { return m_value; }
@ -538,8 +539,7 @@ struct WXDLLIMPEXP_BASE wxArgNormalizerNative<const wxCStrData&>
unsigned index) unsigned index)
: m_value(value) : m_value(value)
{ {
wxASSERT_ARG_TYPE( fmt, index, wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String );
wxFormatString::Arg_String | wxFormatString::Arg_Pointer );
} }
const wxStringCharType *get() const; const wxStringCharType *get() const;
@ -599,8 +599,7 @@ struct wxArgNormalizerUtf8<const char*>
const wxFormatString *fmt, const wxFormatString *fmt,
unsigned index) unsigned index)
{ {
wxASSERT_ARG_TYPE( fmt, index, wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String );
wxFormatString::Arg_String | wxFormatString::Arg_Pointer );
if ( wxLocaleIsUtf8 ) if ( wxLocaleIsUtf8 )
{ {