aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2010-06-05 18:35:53 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2010-06-05 19:35:53 +0100
commit3b1420846cf928b046826db73c1a4fb79e66d476 (patch)
treee3da7b2f487da84dadd4b6ffc83e7c444ee1aa96
parent0fc555fbd31c91fa7607af2a6a6cecd578c1f605 (diff)
downloadgcc-3b1420846cf928b046826db73c1a4fb79e66d476.zip
gcc-3b1420846cf928b046826db73c1a4fb79e66d476.tar.gz
gcc-3b1420846cf928b046826db73c1a4fb79e66d476.tar.bz2
shared_ptr_base.h (_Sp_counted_ptr::_M_dispose): Make nullptr_t specializations inline.
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. From-SVN: r160328
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/shared_ptr_base.h6
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