Added --use-stl to cnfigure, wxUSE_STL to setup0.h
Moved wx/datetime.inl contents to wx/datetime.h and removed inline redefinition hack. Implemented STL-like interface on top of wxList/wxArray, when wxUSE_STL=0. Implemented wxList-like and wxArray interfaces on top of std::list and std::vector, when wxUSE_STL=1. Added arrstr.h, moved wxArrayString declaration there; string.h #includes arrstr.h only if WXWIN_COMPATIBILITY_2_4 is enabled. Added WX_CLEAR_HASH_MAP, WX_CLEAR_HASH_TABLE, WX_CLEAR_LIST macros, to clear a wxHashMap, wxHashTable, wxList containing pointers: deletes pointers and makes container zero-sized. When wxUSE_STL=1, wxStringList works like a std::list<wxString>. Made wxBase compile when wxUSE_STL=1. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
51
configure
vendored
51
configure
vendored
@@ -873,6 +873,7 @@ Optional Features:
|
||||
--enable-shared create shared library code
|
||||
--enable-optimise create optimised code
|
||||
--enable-debug same as debug_flag and debug_info
|
||||
--enable-stl use STL for containers
|
||||
--enable-precomp enable use of precompiled headers (Mac OS X/Darwin)
|
||||
--enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)
|
||||
--enable-debug_info create code with debugging information
|
||||
@@ -1937,6 +1938,7 @@ esac
|
||||
DEBUG_CONFIGURE=0
|
||||
if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_UNIVERSAL=no
|
||||
DEFAULT_wxUSE_STL=no
|
||||
|
||||
DEFAULT_wxUSE_NANOX=no
|
||||
|
||||
@@ -2111,6 +2113,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_MONOLITHIC=yes
|
||||
else
|
||||
DEFAULT_wxUSE_UNIVERSAL=no
|
||||
DEFAULT_wxUSE_STL=no
|
||||
|
||||
DEFAULT_wxUSE_NANOX=no
|
||||
|
||||
@@ -3131,6 +3134,47 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
enablestring=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6
|
||||
no_cache=0
|
||||
# Check whether --enable-stl or --disable-stl was given.
|
||||
if test "${enable_stl+set}" = set; then
|
||||
enableval="$enable_stl"
|
||||
|
||||
if test "$enableval" = yes; then
|
||||
ac_cv_use_stl='wxUSE_STL=yes'
|
||||
else
|
||||
ac_cv_use_stl='wxUSE_STL=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "wxUSE_STL" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
ac_cv_use_stl='wxUSE_STL='$DEFAULT_wxUSE_STL
|
||||
|
||||
fi;
|
||||
|
||||
eval "$ac_cv_use_stl"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$wxUSE_STL" = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
|
||||
enablestring=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-precomp" >&5
|
||||
@@ -29785,6 +29829,13 @@ _ACEOF
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_STL" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_STL 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_APPLE_IEEE" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_APPLE_IEEE 1
|
||||
|
Reference in New Issue
Block a user