diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2004-10-09 08:23:02 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2004-10-09 08:23:02 +0000 |
| commit | dafa8871d1c8c0375763a36a63cc31fee6c0af1c (patch) | |
| tree | 06aec861b66855d311549b98914b1cee7d0e5e75 | |
| parent | c3e7f18406f1869604b48b03f8a1e39123885362 (diff) | |
| download | gcc-dafa8871d1c8c0375763a36a63cc31fee6c0af1c.zip gcc-dafa8871d1c8c0375763a36a63cc31fee6c0af1c.tar.gz gcc-dafa8871d1c8c0375763a36a63cc31fee6c0af1c.tar.bz2 | |
std_memory.h (__get_temporary_buffer): Don't use INT_MAX...
2004-10-09 Paolo Carlini <pcarlini@suse.de>
* include/std/std_memory.h (__get_temporary_buffer): Don't use
INT_MAX, prefer numeric_limits<ptrdiff_t>::max(), ok on 64-bit
platforms too.
* testsuite/20_util/memory/auto_ptr/assign_neg.cc: Adjust dg-error
line numbers.
From-SVN: r88814
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/std_memory.h | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/memory/auto_ptr/assign_neg.cc | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 615d83f..19be846 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2004-10-09 Paolo Carlini <pcarlini@suse.de> + + * include/std/std_memory.h (__get_temporary_buffer): Don't use + INT_MAX, prefer numeric_limits<ptrdiff_t>::max(), ok on 64-bit + platforms too. + * testsuite/20_util/memory/auto_ptr/assign_neg.cc: Adjust dg-error + line numbers. + 2004-10-08 Benjamin Kosnik <bkoz@redhat.com> * acconfig.h: Add _GLIBCXX_USE___CXA_ATEXIT. diff --git a/libstdc++-v3/include/std/std_memory.h b/libstdc++-v3/include/std/std_memory.h index 4e6641e..1d278e6 100644 --- a/libstdc++-v3/include/std/std_memory.h +++ b/libstdc++-v3/include/std/std_memory.h @@ -58,6 +58,7 @@ #include <bits/stl_uninitialized.h> #include <bits/stl_raw_storage_iter.h> #include <debug/debug.h> +#include <limits> namespace std { @@ -73,8 +74,9 @@ namespace std pair<_Tp*, ptrdiff_t> __get_temporary_buffer(ptrdiff_t __len, _Tp*) { - if (__len > ptrdiff_t(INT_MAX / sizeof(_Tp))) - __len = INT_MAX / sizeof(_Tp); + const ptrdiff_t __max = numeric_limits<ptrdiff_t>::max() / sizeof(_Tp); + if (__len > __max) + __len = __max; while (__len > 0) { @@ -105,7 +107,7 @@ namespace std * Provides the nothrow exception guarantee. */ template<typename _Tp> - inline pair<_Tp*,ptrdiff_t> + inline pair<_Tp*, ptrdiff_t> get_temporary_buffer(ptrdiff_t __len) { return std::__get_temporary_buffer(__len, static_cast<_Tp*>(0)); } diff --git a/libstdc++-v3/testsuite/20_util/memory/auto_ptr/assign_neg.cc b/libstdc++-v3/testsuite/20_util/memory/auto_ptr/assign_neg.cc index 8899c98..fc4ba5b 100644 --- a/libstdc++-v3/testsuite/20_util/memory/auto_ptr/assign_neg.cc +++ b/libstdc++-v3/testsuite/20_util/memory/auto_ptr/assign_neg.cc @@ -46,5 +46,5 @@ main() test01(); return 0; } -// { dg-error "candidates" "" { target *-*-* } 222 } -// { dg-error "std::auto_ptr" "" { target *-*-* } 352 } +// { dg-error "candidates" "" { target *-*-* } 224 } +// { dg-error "std::auto_ptr" "" { target *-*-* } 354 } |