diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-11-21 18:10:45 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-11-21 18:10:45 +0000 |
| commit | 4aa6630bbd7abadd3f184afa9d13c5f0fcbfd8b5 (patch) | |
| tree | 1bd095d1f392dffccea7ff12e58fbb48ac9c17e5 /libstdc++-v3/config/locale | |
| parent | 74301837842e62270719ee2e5fa3abca6f497792 (diff) | |
| download | gcc-4aa6630bbd7abadd3f184afa9d13c5f0fcbfd8b5.tar.gz | |
2006-11-21 Benjamin Kosnik <bkoz@redhat.com>
* include/ext/hashtable.h: -Wshadow fixes.
* include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp: Same.
* include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp: Same.
* include/ext/pb_ds/detail/pat_trie_/internal_node.hpp: Same.
* include/ext/pb_ds/detail/gp_hash_table_map_/
constructor_destructor_fn_imps.hpp: Same.
* include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp: Same.
* include/ext/pb_ds/detail/ov_tree_map_/
constructors_destructor_fn_imps.hpp: Same.
* src/mt_allocator.cc: Same.
* src/debug.cc: Same.
* config/locale/gnu/codecvt_members.cc: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@119061 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/config/locale')
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/codecvt_members.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/config/locale/gnu/codecvt_members.cc b/libstdc++-v3/config/locale/gnu/codecvt_members.cc index bc454228d67..ac1fe9267c8 100644 --- a/libstdc++-v3/config/locale/gnu/codecvt_members.cc +++ b/libstdc++-v3/config/locale/gnu/codecvt_members.cc @@ -1,6 +1,6 @@ // std::codecvt implementation details, GNU version -*- C++ -*- -// Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -95,14 +95,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { extern_type __buf[MB_LEN_MAX]; __tmp_state = __state; - const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state); - if (__conv > static_cast<size_t>(__to_end - __to_next)) + const size_t __conv2 = wcrtomb(__buf, *__from_next, &__tmp_state); + if (__conv2 > static_cast<size_t>(__to_end - __to_next)) __ret = partial; else { - memcpy(__to_next, __buf, __conv); + memcpy(__to_next, __buf, __conv2); __state = __tmp_state; - __to_next += __conv; + __to_next += __conv2; ++__from_next; } } |