From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 5 Jun 2010 18:35:53 +0000 (+0000)
Subject: 2010-06-05  Jonathan Wakely  <jwakely.gcc@gmail.com>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaf2005142c28852eaf33ff434622e26640395aa;p=thirdparty%2Fgcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160328 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 050478f69ced..2033e19bbbb0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h
index cac1a70c1678..d4c8c8fb8242 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