diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2000-11-16 01:03:20 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-11-16 01:03:20 +0000 |
| commit | 4f12dd3c7d170eda9ba67a1b82ece77511708944 (patch) | |
| tree | 8bf2e6ad149a58f65aa22945786c62f4e8a30c65 | |
| parent | 9e038f71b0fd46517c31a72a82cf483b16990ba2 (diff) | |
| download | gcc-4f12dd3c7d170eda9ba67a1b82ece77511708944.zip gcc-4f12dd3c7d170eda9ba67a1b82ece77511708944.tar.gz gcc-4f12dd3c7d170eda9ba67a1b82ece77511708944.tar.bz2 | |
mkcheckin.in: Move check for bash version 2 later in the file.
* 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.
From-SVN: r37490
| -rw-r--r-- | libstdc++-v3/ChangeLog | 11 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/string.tcc | 8 | ||||
| -rwxr-xr-x | libstdc++-v3/mkcheck.in | 13 |
4 files changed, 23 insertions, 13 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2861d5b..1de4d67 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +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. diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 60795f7..6f3b372 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -131,8 +131,8 @@ namespace std { // 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; diff --git a/libstdc++-v3/include/bits/string.tcc b/libstdc++-v3/include/bits/string.tcc index 82a5a7a..386108d 100644 --- a/libstdc++-v3/include/bits/string.tcc +++ b/libstdc++-v3/include/bits/string.tcc @@ -44,23 +44,23 @@ namespace std { 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)]; diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in index 066853a..9d676e8 100755 --- a/libstdc++-v3/mkcheck.in +++ b/libstdc++-v3/mkcheck.in @@ -19,13 +19,6 @@ ### 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 # @@ -91,6 +84,12 @@ if [ $WHICH -eq 2 ]; then 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 |