* include/bits/basic_string.h (getline): Declare inline.

From-SVN: r213873

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1e1e522665a79fde9f5d8317ba91624e38719ab1..7b411f3e60ddd0ae9909ef9ea4a66d07ed8d55d0 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -7,6 +7,8 @@
        * testsuite/21_strings/basic_string/inserters_extractors/wchar_t/12.cc:
        New.
 
+       * include/bits/basic_string.h (getline): Declare inline.
+
 2014-08-09  Ulrich Drepper  <drepper@gmail.com>
 
        * include/ext/random.tcc (uniform_on_sphere_helper): Define.

diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 6a54d0c20a946d50c94d5fa0b27560a202765088..93ceb6dae5d09f7405414da257dcbc85c2f3e926 100644 (file)
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -2816,7 +2816,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #if __cplusplus >= 201103L
   /// Read a line from an rvalue stream into a string.
   template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
+    inline basic_istream<_CharT, _Traits>&
     getline(basic_istream<_CharT, _Traits>&& __is,
            basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim)
     { return std::getline(__is, __str, __delim); }