Add inline to std::__invfwd

	PR libstdc++/59768
	* include/std/functional (__invfwd): Add inline specifier.

From-SVN: r231900

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6156979853a23cb8cbe976fdeaea9a254cd3bafd..766e9f160802295f07aaba99bd4131a9ceb7391a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-22  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/59768
+       * include/std/functional (__invfwd): Add inline specifier.
+
 2015-12-21  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/68982

diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional
index b994df48dc14d77727abcac3325aa33c11b934db..9b853e83a7b9c8075f4fd0413c7ab79bb15a8133 100644 (file)
--- a/libstdc++-v3/include/std/functional
+++ b/libstdc++-v3/include/std/functional
@@ -207,7 +207,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   // Used by __invoke_impl instead of std::forward<_Tp> so that a
   // reference_wrapper is converted to an lvalue-reference.
   template<typename _Tp>
-    typename _Unwrap<_Tp>::type
+    inline typename _Unwrap<_Tp>::type
     __invfwd(typename remove_reference<_Tp>::type& __t) noexcept
     { return _Unwrap<_Tp>::_S_fwd(__t); }