diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/shared_ptr_base.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 050478f..2033e19 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2010-06-05 Jonathan Wakely <jwakely.gcc@gmail.com> + * include/bits/shared_ptr_base.h (_Sp_counted_ptr::_M_dispose): Make + nullptr_t specializations inline. + +2010-06-05 Jonathan Wakely <jwakely.gcc@gmail.com> + * doc/xml/manual/status_cxx200x.xml: Update. 2010-06-05 Magnus Fromreide <magfr@lysator.liu.se> diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index cac1a70..d4c8c8f 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -109,15 +109,15 @@ _GLIBCXX_BEGIN_NAMESPACE(std) }; template<> - void + inline void _Sp_counted_ptr<nullptr_t, _S_single>::_M_dispose() { } template<> - void + inline void _Sp_counted_ptr<nullptr_t, _S_mutex>::_M_dispose() { } template<> - void + inline void _Sp_counted_ptr<nullptr_t, _S_atomic>::_M_dispose() { } // Support for custom deleter and/or allocator |