diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/vec.cc | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d0c46d0..e5658be 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2003-11-07 Jonathan Wakely <redi@gcc.gnu.org> + + * libsupc++/vec.cc: Conform to C++STYLE. + 2003-11-07 Carlo Wood <carlo@alinoe.com> PR libstdc++/12736 diff --git a/libstdc++-v3/libsupc++/vec.cc b/libstdc++-v3/libsupc++/vec.cc index 2725593..908fe99 100644 --- a/libstdc++-v3/libsupc++/vec.cc +++ b/libstdc++-v3/libsupc++/vec.cc @@ -282,12 +282,10 @@ namespace __cxxabiv1 void (*destructor) (void *), void (*dealloc) (void *)) { - char *base; - if (!array_address) return; - base = static_cast<char *>(array_address); + char* base = static_cast<char *>(array_address); if (padding_size) { @@ -317,15 +315,12 @@ namespace __cxxabiv1 void (*destructor) (void *), void (*dealloc) (void *, std::size_t)) { - char *base; - std::size_t size; - if (!array_address) return; - base = static_cast <char *> (array_address); - size = 0; - + char* base = static_cast <char *> (array_address); + std::size_t size = 0; + if (padding_size) { std::size_t element_count = reinterpret_cast<std::size_t *> (base)[-1]; |