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

fixes to wint_t and wchar_t handling in unichar.h (fixes FreeBSD compilation and Mingw compilation with -pedantic)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-26 20:44:58 +00:00
parent 1f3b7817eb
commit 21f0762a1a
5 changed files with 154 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 46644 2007-06-22 18:06:12Z VZ . # From configure.in Id: configure.in 46702 2007-06-26 11:58:21Z VS .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
# #
@@ -34077,6 +34077,74 @@ _ACEOF
fi fi
fi fi
{ echo "$as_me:$LINENO: checking if wchar_t is separate type" >&5
echo $ECHO_N "checking if wchar_t is separate type... $ECHO_C" >&6; }
if test "${wx_cv_wchar_t_is_separate_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <wchar.h>
int
main ()
{
return 0; }
struct Foo { void foo(wchar_t);
void foo(unsigned short);
void foo(unsigned int);
void foo(unsigned long); };
int bar() {
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_wchar_t_is_separate_type=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
wx_cv_wchar_t_is_separate_type=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $wx_cv_wchar_t_is_separate_type" >&5
echo "${ECHO_T}$wx_cv_wchar_t_is_separate_type" >&6; }
if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxWCHAR_T_IS_SEPARATE_TYPE 1
_ACEOF
fi
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

22
configure.in
View File

@@ -4411,6 +4411,28 @@ else
fi fi
fi fi
AC_CACHE_CHECK([if wchar_t is separate type],
wx_cv_wchar_t_is_separate_type,
AC_TRY_COMPILE([#include <wchar.h>],
[
return 0; }
struct Foo { void foo(wchar_t);
void foo(unsigned short);
void foo(unsigned int);
void foo(unsigned long); };
int bar() {
],
wx_cv_wchar_t_is_separate_type=yes,
wx_cv_wchar_t_is_separate_type=no
)
)
if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then
AC_DEFINE(wxWCHAR_T_IS_SEPARATE_TYPE)
fi
AC_LANG_POP() dnl C++ AC_LANG_POP() dnl C++
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------

125
include/wx/unichar.h
View File

@@ -15,29 +15,22 @@
#include "wx/chartype.h" #include "wx/chartype.h"
#include "wx/stringimpl.h" #include "wx/stringimpl.h"
// wint_t is just a typedef for wchar_t for many old compilers but for modern #ifndef wxWCHAR_T_IS_SEPARATE_TYPE
// ones it's a separate type and we must provide a conversion to it to allow #ifdef __GNUG__
// passing wxUniChar[Ref] to functions taking wint_t such as iswalnum() &c #define wxWCHAR_T_IS_SEPARATE_TYPE
#if (defined(__GNUC__) && \ #endif
!defined(__DARWIN__) && !defined(__OS2__) && !defined(__DOS__)) || \ #if defined(__VISUALC__) && defined(_NATIVE_WCHAR_T_DEFINED)
(defined(__VISUALC__) && defined(_NATIVE_WCHAR_T_DEFINED)) || \ #define wxWCHAR_T_IS_SEPARATE_TYPE
wxCHECK_SUNCC_VERSION(5, 9) #endif
#define wxWINT_T_IS_SEPARATE_TYPE
#endif #endif
// helper macro for doing something dependent on whether wint_t is or isn't a // helper macro for doing something dependent on whether wchar_t is or isn't a
// typedef inside another macro // typedef inside another macro
#ifdef wxWINT_T_IS_SEPARATE_TYPE #ifdef wxWCHAR_T_IS_SEPARATE_TYPE
#define wxIF_WINT_T_TYPE(x) x #define wxIF_WCHAR_T_TYPE(x) x
#else // !wxWINT_T_IS_SEPARATE_TYPE #else // !wxWCHAR_T_IS_SEPARATE_TYPE
#define wxIF_WINT_T_TYPE(x) #define wxIF_WCHAR_T_TYPE(x)
#endif // wxWINT_T_IS_SEPARATE_TYPE/!wxWINT_T_IS_SEPARATE_TYPE #endif // wxWCHAR_T_IS_SEPARATE_TYPE/!wxWCHAR_T_IS_SEPARATE_TYPE
// wchar_t seems to be defined as unsigned short by all Windows compilers but
// unsigned int everywhere else
#ifndef __WIN32__
#define wxWCHAR_T_IS_UINT
#endif
class WXDLLIMPEXP_BASE wxUniCharRef; class WXDLLIMPEXP_BASE wxUniCharRef;
class WXDLLIMPEXP_BASE wxStringIteratorNode; class WXDLLIMPEXP_BASE wxStringIteratorNode;
@@ -60,13 +53,16 @@ public:
wxUniChar(unsigned char c) { m_value = From8bit((char)c); } wxUniChar(unsigned char c) { m_value = From8bit((char)c); }
// Create the character from a wchar_t character value. // Create the character from a wchar_t character value.
#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
wxUniChar(wchar_t c) { m_value = c; } wxUniChar(wchar_t c) { m_value = c; }
#ifdef wxWINT_T_IS_SEPARATE_TYPE
wxUniChar(wint_t c) { m_value = c; }
#endif #endif
wxUniChar(int c) { m_value = c; } wxUniChar(int c) { m_value = c; }
wxUniChar(unsigned int c) { m_value = c; }
wxUniChar(long int c) { m_value = c; } wxUniChar(long int c) { m_value = c; }
wxUniChar(unsigned long int c) { m_value = c; }
wxUniChar(short int c) { m_value = c; }
wxUniChar(unsigned short int c) { m_value = c; }
wxUniChar(const wxUniCharRef& c); wxUniChar(const wxUniCharRef& c);
@@ -93,22 +89,16 @@ public:
// able to pass wxUniChars to verious standard narrow and wide character // able to pass wxUniChars to verious standard narrow and wide character
// functions // functions
operator char() const { return To8bit(m_value); } operator char() const { return To8bit(m_value); }
operator wchar_t() const { return m_value; }
operator int() const { return m_value; }
operator long int() const { return m_value; }
#ifndef wxWCHAR_T_IS_UINT
operator unsigned int() const { return m_value; }
#endif
// More conversions needed for other standard functions: uchar is for VC++
// _mbxxx() ones (to which toxxx/isxxx() are mapped when _MBCS is defined)
// and some wide character functions take wint_t which happens to be the
// same as wchar_t for Windows compilers but not for g++ (except for the
// special Apple version)
operator unsigned char() const { return (unsigned char)To8bit(m_value); } operator unsigned char() const { return (unsigned char)To8bit(m_value); }
#ifdef wxWINT_T_IS_SEPARATE_TYPE #ifdef wxWCHAR_T_IS_SEPARATE_TYPE
operator wint_t() const { return m_value; } operator wchar_t() const { return m_value; }
#endif #endif
operator int() const { return m_value; }
operator unsigned int() const { return m_value; }
operator long int() const { return m_value; }
operator unsigned long int() const { return m_value; }
operator short int() const { return m_value; }
operator unsigned short int() const { return m_value; }
// We need this operator for the "*p" part of expressions like "for ( // We need this operator for the "*p" part of expressions like "for (
// const_iterator p = begin() + nStart; *p; ++p )". In this case, // const_iterator p = begin() + nStart; *p; ++p )". In this case,
@@ -126,12 +116,15 @@ public:
wxUniChar& operator=(const wxUniChar& c) { m_value = c.m_value; return *this; } wxUniChar& operator=(const wxUniChar& c) { m_value = c.m_value; return *this; }
wxUniChar& operator=(char c) { m_value = From8bit(c); return *this; } wxUniChar& operator=(char c) { m_value = From8bit(c); return *this; }
wxUniChar& operator=(unsigned char c) { m_value = From8bit((char)c); return *this; } wxUniChar& operator=(unsigned char c) { m_value = From8bit((char)c); return *this; }
#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
wxUniChar& operator=(wchar_t c) { m_value = c; return *this; } wxUniChar& operator=(wchar_t c) { m_value = c; return *this; }
wxUniChar& operator=(int c) { m_value = c; return *this; }
wxUniChar& operator=(long int c) { m_value = c; return *this; }
#ifdef wxWINT_T_IS_SEPARATE_TYPE
wxUniChar& operator=(wint_t c) { m_value = c; return *this; }
#endif #endif
wxUniChar& operator=(int c) { m_value = c; return *this; }
wxUniChar& operator=(unsigned int c) { m_value = c; return *this; }
wxUniChar& operator=(long int c) { m_value = c; return *this; }
wxUniChar& operator=(unsigned long int c) { m_value = c; return *this; }
wxUniChar& operator=(short int c) { m_value = c; return *this; }
wxUniChar& operator=(unsigned short int c) { m_value = c; return *this; }
// Comparison operators: // Comparison operators:
@@ -140,10 +133,13 @@ public:
bool operator op(const wxUniChar& c) const { return m_value op c.m_value; }\ bool operator op(const wxUniChar& c) const { return m_value op c.m_value; }\
bool operator op(char c) const { return m_value op From8bit(c); } \ bool operator op(char c) const { return m_value op From8bit(c); } \
bool operator op(unsigned char c) const { return m_value op From8bit((char)c); } \ bool operator op(unsigned char c) const { return m_value op From8bit((char)c); } \
bool operator op(wchar_t c) const { return m_value op (value_type)c; } \ wxIF_WCHAR_T_TYPE( bool operator op(wchar_t c) const { return m_value op (value_type)c; } ) \
bool operator op(int c) const { return m_value op (value_type)c; } \ bool operator op(int c) const { return m_value op (value_type)c; } \
bool operator op(unsigned int c) const { return m_value op (value_type)c; } \
bool operator op(short int c) const { return m_value op (value_type)c; } \
bool operator op(unsigned short int c) const { return m_value op (value_type)c; } \
bool operator op(long int c) const { return m_value op (value_type)c; } \ bool operator op(long int c) const { return m_value op (value_type)c; } \
wxIF_WINT_T_TYPE( bool operator op(wint_t c) const { return m_value op (value_type)c; } ) bool operator op(unsigned long int c) const { return m_value op (value_type)c; }
wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR) wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR)
@@ -154,9 +150,7 @@ public:
int operator-(char c) const { return m_value - From8bit(c); } int operator-(char c) const { return m_value - From8bit(c); }
int operator-(unsigned char c) const { return m_value - From8bit((char)c); } int operator-(unsigned char c) const { return m_value - From8bit((char)c); }
int operator-(wchar_t c) const { return m_value - (value_type)c; } int operator-(wchar_t c) const { return m_value - (value_type)c; }
#ifdef wxWINT_T_IS_SEPARATE_TYPE
int operator-(wint_t c) const { return m_value - (value_type)c; }
#endif
private: private:
static value_type From8bit(char c); static value_type From8bit(char c);
@@ -217,25 +211,28 @@ public:
wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); } wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); }
wxUniCharRef& operator=(unsigned char c) { return *this = wxUniChar(c); } wxUniCharRef& operator=(unsigned char c) { return *this = wxUniChar(c); }
#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); } wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); }
wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); }
wxUniCharRef& operator=(long int c) { return *this = wxUniChar(c); }
#ifdef wxWINT_T_IS_SEPARATE_TYPE
wxUniCharRef& operator=(wint_t c) { return *this = wxUniChar(c); }
#endif #endif
wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); }
wxUniCharRef& operator=(unsigned int c) { return *this = wxUniChar(c); }
wxUniCharRef& operator=(short int c) { return *this = wxUniChar(c); }
wxUniCharRef& operator=(unsigned short int c) { return *this = wxUniChar(c); }
wxUniCharRef& operator=(long int c) { return *this = wxUniChar(c); }
wxUniCharRef& operator=(unsigned long int c) { return *this = wxUniChar(c); }
// Conversions to the same types as wxUniChar is convertible too: // Conversions to the same types as wxUniChar is convertible too:
operator char() const { return UniChar(); } operator char() const { return UniChar(); }
operator int() const { return UniChar(); }
operator long int() const { return UniChar(); }
operator unsigned char() const { return UniChar(); } operator unsigned char() const { return UniChar(); }
#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
operator wchar_t() const { return UniChar(); } operator wchar_t() const { return UniChar(); }
#ifdef wxWINT_T_IS_SEPARATE_TYPE
operator wint_t() const { return UniChar(); }
#endif #endif
#ifndef wxWCHAR_T_IS_UINT operator int() const { return UniChar(); }
operator unsigned int() const { return UniChar(); } operator unsigned int() const { return UniChar(); }
#endif operator short int() const { return UniChar(); }
operator unsigned short int() const { return UniChar(); }
operator long int() const { return UniChar(); }
operator unsigned long int() const { return UniChar(); }
// see wxUniChar::operator bool etc. for explanation // see wxUniChar::operator bool etc. for explanation
operator bool() const { return (bool)UniChar(); } operator bool() const { return (bool)UniChar(); }
@@ -248,10 +245,13 @@ public:
bool operator op(const wxUniChar& c) const { return UniChar() op c; } \ bool operator op(const wxUniChar& c) const { return UniChar() op c; } \
bool operator op(char c) const { return UniChar() op c; } \ bool operator op(char c) const { return UniChar() op c; } \
bool operator op(unsigned char c) const { return UniChar() op c; } \ bool operator op(unsigned char c) const { return UniChar() op c; } \
bool operator op(wchar_t c) const { return UniChar() op c; } \ wxIF_WCHAR_T_TYPE( bool operator op(wchar_t c) const { return UniChar() op c; } ) \
bool operator op(int c) const { return UniChar() op c; } \ bool operator op(int c) const { return UniChar() op c; } \
bool operator op(unsigned int c) const { return UniChar() op c; } \
bool operator op(short int c) const { return UniChar() op c; } \
bool operator op(unsigned short int c) const { return UniChar() op c; } \
bool operator op(long int c) const { return UniChar() op c; } \ bool operator op(long int c) const { return UniChar() op c; } \
wxIF_WINT_T_TYPE( bool operator op(wint_t c) const { return UniChar() op c; } ) bool operator op(unsigned long int c) const { return UniChar() op c; }
wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR) wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR)
@@ -263,9 +263,6 @@ public:
int operator-(char c) const { return UniChar() - c; } int operator-(char c) const { return UniChar() - c; }
int operator-(unsigned char c) const { return UniChar() - c; } int operator-(unsigned char c) const { return UniChar() - c; }
int operator-(wchar_t c) const { return UniChar() - c; } int operator-(wchar_t c) const { return UniChar() - c; }
#ifdef wxWINT_T_IS_SEPARATE_TYPE
int operator-(wint_t c) const { return UniChar() - c; }
#endif
private: private:
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_UTF8
@@ -300,11 +297,6 @@ wxDEFINE_COMPARISONS(char, const wxUniCharRef&, wxCMP_REVERSE)
wxDEFINE_COMPARISONS(wchar_t, const wxUniChar&, wxCMP_REVERSE) wxDEFINE_COMPARISONS(wchar_t, const wxUniChar&, wxCMP_REVERSE)
wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE) wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE)
#ifdef wxWINT_T_IS_SEPARATE_TYPE
wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE)
wxDEFINE_COMPARISONS(wint_t, const wxUniCharRef&, wxCMP_REVERSE)
#endif
wxDEFINE_COMPARISONS(const wxUniChar&, const wxUniCharRef&, wxCMP_REVERSE) wxDEFINE_COMPARISONS(const wxUniChar&, const wxUniCharRef&, wxCMP_REVERSE)
#undef wxCMP_REVERSE #undef wxCMP_REVERSE
@@ -313,8 +305,5 @@ wxDEFINE_COMPARISONS(const wxUniChar&, const wxUniCharRef&, wxCMP_REVERSE)
inline int operator-(char c1, const wxUniCharRef& c2) { return -(c2 - c1); } inline int operator-(char c1, const wxUniCharRef& c2) { return -(c2 - c1); }
inline int operator-(const wxUniChar& c1, const wxUniCharRef& c2) { return -(c2 - c1); } inline int operator-(const wxUniChar& c1, const wxUniCharRef& c2) { return -(c2 - c1); }
inline int operator-(wchar_t c1, const wxUniCharRef& c2) { return -(c2 - c1); } inline int operator-(wchar_t c1, const wxUniCharRef& c2) { return -(c2 - c1); }
#ifdef wxWINT_T_IS_SEPARATE_TYPE
inline int operator-(wint_t c1, const wxUniCharRef& c2) { return -(c2 - c1); }
#endif
#endif /* _WX_UNICHAR_H_ */ #endif /* _WX_UNICHAR_H_ */

3
setup.h.in
View File

@@ -948,6 +948,9 @@
/* Define if size_t on your machine is the same type as unsigned long. */ /* Define if size_t on your machine is the same type as unsigned long. */
#undef wxSIZE_T_IS_ULONG #undef wxSIZE_T_IS_ULONG
/* Define if wchar_t is distinct type in your compiler. */
#undef wxWCHAR_T_IS_SEPARATE_TYPE
/* Define if you have the dlopen function. */ /* Define if you have the dlopen function. */
#undef HAVE_DLOPEN #undef HAVE_DLOPEN

3
setup.h_vms
View File

@@ -1033,6 +1033,9 @@ typedef pid_t GPid;
/* Define if size_t on your machine is the same type as unsigned long. */ /* Define if size_t on your machine is the same type as unsigned long. */
#undef wxSIZE_T_IS_ULONG #undef wxSIZE_T_IS_ULONG
/* Define if wchar_t is distinct type in your compiler. */
#define wxWCHAR_T_IS_SEPARATE_TYPE 1
/* Define if you have the dlopen function. */ /* Define if you have the dlopen function. */
#define HAVE_DLOPEN 1 #define HAVE_DLOPEN 1