re PR libstdc++/65499 (Missing "using namespace literals::chrono_literals" in std...

	PR libstdc++/65499
	* include/std/chrono: Add using-directive for literals to std::chrono.
	* testsuite/20_util/duration/literals/65499.cc: New.

From-SVN: r222004

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ef8e96490098bf3bd5f5761000959a0c81323e94..645727f9def91e6c39ed204ae8d76c61a4ed9aa9 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2015-04-11  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2015-03-27  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/65499
+       * include/std/chrono: Add using-directive for literals to std::chrono.
+       * testsuite/20_util/duration/literals/65499.cc: New.
+
        Backport from mainline
        2015-03-26  Jonathan Wakely  <jwakely@redhat.com>
 

diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono
index 6e9c7dc97157c79d5fd569085d48e0c07a478f71..e546ab98e3ab5e84c85cb04de6c85d2ed8906e90 100644 (file)
--- a/libstdc++-v3/include/std/chrono
+++ b/libstdc++-v3/include/std/chrono
@@ -904,6 +904,15 @@ _GLIBCXX_END_NAMESPACE_VERSION
   } // inline namespace chrono_literals
   } // inline namespace literals
 
+  namespace chrono
+  {
+  _GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  using namespace literals::chrono_literals;
+
+  _GLIBCXX_END_NAMESPACE_VERSION
+  } // namespace chrono
+
 #endif // __cplusplus > 201103L
 
   // @} group chrono

diff --git a/libstdc++-v3/testsuite/20_util/duration/literals/65499.cc b/libstdc++-v3/testsuite/20_util/duration/literals/65499.cc
new file mode 100644 (file)
index 0000000..62c4f5a
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/duration/literals/65499.cc
@@ -0,0 +1,26 @@
+// Copyright (C) 2015 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++14" }
+// { dg-do compile }
+
+// PR libstdc++/65499
+
+#include <chrono>
+
+using namespace std::chrono;
+minutes min = 36min;