diff options
author | Paolo Carlini <pcarlini@unitus.it> | 2003-02-18 11:54:37 +0100 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-02-18 10:54:37 +0000 |
commit | 14a65f50b0f373368794a88adf2aee18db0a023a (patch) | |
tree | e64a71ec70a416d917a46e383d6dd1a9da5f2880 | |
parent | f57a2e3a8ae273d4db185f7d0be3f68024ca4763 (diff) | |
download | gcc-14a65f50b0f373368794a88adf2aee18db0a023a.zip gcc-14a65f50b0f373368794a88adf2aee18db0a023a.tar.gz gcc-14a65f50b0f373368794a88adf2aee18db0a023a.tar.bz2 |
re PR libstdc++/9582 (ODR violation in std::allocator)
2003-02-18 Paolo Carlini <pcarlini@unitus.it>
PR libstdc++/9582
* include/bits/stl_alloc.h (__pool_alloc::allocate):
Remove assert.
From-SVN: r63031
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_alloc.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f3fb9fe..46a8069 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2003-02-18 Paolo Carlini <pcarlini@unitus.it> + + PR libstdc++/9582 + * include/bits/stl_alloc.h (__pool_alloc::allocate): Remove assert. + 2003-02-17 Benjamin Kosnik <bkoz@redhat.com> * include/bits/basic_ios.tcc (copyfmt): Copy locale data as well. diff --git a/libstdc++-v3/include/bits/stl_alloc.h b/libstdc++-v3/include/bits/stl_alloc.h index 96b51d1..92029ea 100644 --- a/libstdc++-v3/include/bits/stl_alloc.h +++ b/libstdc++-v3/include/bits/stl_alloc.h @@ -352,8 +352,6 @@ namespace std __atomic_add(&_S_force_new, 1); else __atomic_add(&_S_force_new, -1); - // Trust but verify... - assert(_S_force_new != 0); } if ((__n > (size_t) _MAX_BYTES) || (_S_force_new > 0)) |