+2000-11-15 Mark Mitchell <mark@codesourcery.com>
+
+ * mkcheckin.in: Move check for bash version 2 later in the file.
+
+ * include/bits/basic_string.h (basic_string::_Rep::_S_max_size):
+ Make it const.
+ (basic_string::_Rep::_S_terminal): Likewise.
+ * include/bits/string.tcc (basic_string::_Rep::_S_max_size):
+ Likewise.
+ (basic_string::_Rep::_S_terminal): Likewise.
+
2000-11-15 David Billinghurst <David.Billinghurst@riotinto.com>
* mkcheck.in: Add function size_command() for irix.
// Solving for m:
// m = ((npos - sizeof(_Rep))/sizeof(CharT)) - 1
// In addition, this implementation quarters this ammount.
- static size_type _S_max_size;
- static _CharT _S_terminal;
+ static const size_type _S_max_size;
+ static const _CharT _S_terminal;
size_type _M_length;
size_type _M_capacity;
{
template<typename _CharT, typename _Traits, typename _Alloc>
- _CharT
+ const _CharT
basic_string<_CharT, _Traits, _Alloc>::
_Rep::_S_terminal = _CharT();
template<typename _CharT, typename _Traits, typename _Alloc>
- typename basic_string<_CharT, _Traits, _Alloc>::size_type
+ const typename basic_string<_CharT, _Traits, _Alloc>::size_type
basic_string<_CharT, _Traits, _Alloc>::
_Rep::_S_max_size = (((npos - sizeof(_Rep))/sizeof(_CharT)) - 1) / 4;
template<typename _CharT, typename _Traits, typename _Alloc>
- const basic_string<_CharT, _Traits, _Alloc>::size_type
+ const typename basic_string<_CharT, _Traits, _Alloc>::size_type
basic_string<_CharT, _Traits, _Alloc>::npos;
// Linker sets _S_empty_rep_storage to all 0s (one reference, empty string)
// at static init time (before static ctors are run).
template<typename _CharT, typename _Traits, typename _Alloc>
- basic_string<_CharT, _Traits, _Alloc>::size_type
+ typename basic_string<_CharT, _Traits, _Alloc>::size_type
basic_string<_CharT, _Traits, _Alloc>::_S_empty_rep_storage[
(sizeof(_Rep) + sizeof(_CharT) + sizeof(size_type) - 1)/sizeof(size_type)];
### XXX Note that breaking out of this with ^C will not work. Dunno why.
-# This has been true all along. Found out about it the hard way...
-case $BASH_VERSION in
- 1*) echo 'You need bash 2.x to run mkcheck. Exiting.'; exit 1 ;;
- *) ;; # ??
-esac
-
-
#
# 1: variables
#
exit 0;
fi
+# This has been true all along. Found out about it the hard way...
+case $BASH_VERSION in
+ 1*) echo 'You need bash 2.x to run mkcheck. Exiting.'; exit 1 ;;
+ *) ;; # ??
+esac
+
# It's not dejagnu; we need to do things ourselves. Pick up any extra
# settings for this target.
. ${top_srcdir}/configure.target