From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 22 Dec 2015 11:37:07 +0000 (+0000)
Subject: Add inline to std::__invfwd
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9643ce888b6634d4f6c44ad3c48bd105f38474e8;p=gcc.git

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 6156979853a..766e9f16080 100644
--- 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 b994df48dc1..9b853e83a7b 100644
--- 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); }