diff options
| author | Eric Christopher <echristo@redhat.com> | 2002-10-23 01:14:10 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@redhat.com> | 2002-10-23 01:14:10 +0000 |
| commit | b411ca57218adfeeb42aa5cd612185a1ccdc57ef (patch) | |
| tree | c9309bcba890469c1ee313f077041feb715fd817 /libstdc++-v3/src/codecvt.cc | |
| parent | 0291f1f2ee11b6fceee0f3ea6b4b51b2bd10c22e (diff) | |
Merge from basic-improvements-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/mips-3_4-rewrite-branch@58434 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src/codecvt.cc')
| -rw-r--r-- | libstdc++-v3/src/codecvt.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libstdc++-v3/src/codecvt.cc b/libstdc++-v3/src/codecvt.cc index 8d4c1b40c7e..b9575cf70bc 100644 --- a/libstdc++-v3/src/codecvt.cc +++ b/libstdc++-v3/src/codecvt.cc @@ -55,10 +55,7 @@ namespace std codecvt<char, char, mbstate_t>:: ~codecvt() - { - if (_M_c_locale_codecvt != _S_c_locale) - _S_destroy_c_locale(_M_c_locale_codecvt); - } + { _S_destroy_c_locale(_M_c_locale_codecvt); } codecvt_base::result codecvt<char, char, mbstate_t>:: @@ -123,7 +120,7 @@ namespace std codecvt<wchar_t, char, mbstate_t>:: codecvt(size_t __refs) : __codecvt_abstract_base<wchar_t, char, mbstate_t>(__refs) - { _M_c_locale_codecvt = _S_c_locale; } + { _M_c_locale_codecvt = _S_c_locale; } codecvt<wchar_t, char, mbstate_t>:: codecvt(__c_locale __cloc, size_t __refs) @@ -132,10 +129,7 @@ namespace std codecvt<wchar_t, char, mbstate_t>:: ~codecvt() - { - if (_M_c_locale_codecvt != _S_c_locale) - _S_destroy_c_locale(_M_c_locale_codecvt); - } + { _S_destroy_c_locale(_M_c_locale_codecvt); } codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: |