Implement C++11 <codecvt> header.

	* config/abi/pre/gnu.ver: Export new symbols.
	* include/Makefile.am: Add codecvt.
	* include/Makefile.in: Regenerate.
	* include/std/codecvt: New header.
	* src/c++11/codecvt.cc (__codecvt_utf8_base, __codecvt_utf16_base,
	__codecvt_utf8_utf16_base): Define specializations.
	* testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc: New.
	* testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc: New.
	* testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc:
	New.

From-SVN: r219779

libstdc++-v3/ChangeLog

+2015-01-16  Jonathan Wakely  <jwakely@redhat.com>
+
+	* config/abi/pre/gnu.ver: Export new symbols.
+	* include/Makefile.am: Add codecvt.
+	* include/Makefile.in: Regenerate.
+	* include/std/codecvt: New header.
+	* src/c++11/codecvt.cc (__codecvt_utf8_base, __codecvt_utf16_base,
+	__codecvt_utf8_utf16_base): Define specializations.
+	* testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc: New.
+	* testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc: New.
+	* testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc:
+	New.
+
 2015-01-16  Torvald Riegel  <triegel@redhat.com>
 
 	* src/c++11/futex.cc: New file.

libstdc++-v3/config/abi/pre/gnu.ver

@@ -1769,6 +1769,17 @@ GLIBCXX_3.4.21 {
       std::__atomic_futex_unsigned_base*;
     };
 
+    # codecvt_utf8 etc.
+    _ZNKSt19__codecvt_utf8_base*;
+    _ZNSt19__codecvt_utf8_base*;
+    _ZT[ISV]St19__codecvt_utf8_base*;
+    _ZNKSt20__codecvt_utf16_base*;
+    _ZNSt20__codecvt_utf16_base*;
+    _ZT[ISV]St20__codecvt_utf16_base*;
+    _ZNKSt25__codecvt_utf8_utf16_base*;
+    _ZNSt25__codecvt_utf8_utf16_base*;
+    _ZT[ISV]St25__codecvt_utf8_utf16_base*;
+
 } GLIBCXX_3.4.20;
 
 

libstdc++-v3/include/Makefile.am

@@ -31,6 +31,7 @@ std_headers = \
 	${std_srcdir}/atomic \
 	${std_srcdir}/bitset \
 	${std_srcdir}/chrono \
+	${std_srcdir}/codecvt \
 	${std_srcdir}/complex \
 	${std_srcdir}/condition_variable \
 	${std_srcdir}/deque \

libstdc++-v3/include/Makefile.in

@@ -299,6 +299,7 @@ std_headers = \
 	${std_srcdir}/atomic \
 	${std_srcdir}/bitset \
 	${std_srcdir}/chrono \
+	${std_srcdir}/codecvt \
 	${std_srcdir}/complex \
 	${std_srcdir}/condition_variable \
 	${std_srcdir}/deque \

libstdc++-v3/include/std/codecvt

+// <codecvt> -*- C++ -*-
+
+// 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+// ISO C++ 14882: 22.5  Standard code conversion facets
+
+/** @file include/codecvt
+ *  This is a Standard C++ Library header.
+ */
+
+#ifndef _GLIBCXX_CODECVT
+#define _GLIBCXX_CODECVT 1
+
+#pragma GCC system_header
+
+#if __cplusplus < 201103L
+# include <bits/c++0x_warning.h>
+#else
+
+#include <bits/locale_classes.h>
+#include <bits/codecvt.h>
+
+#ifdef _GLIBCXX_USE_C99_STDINT_TR1
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  enum codecvt_mode
+  {
+    consume_header = 4,
+    generate_header = 2,
+    little_endian = 1
+  };
+
+  template<typename _Elem, unsigned long _Maxcode = 0x10ffff,
+	   codecvt_mode _Mode = (codecvt_mode)0>
+    class codecvt_utf8 : public codecvt<_Elem, char, mbstate_t>
+    {
+    public:
+      explicit
+      codecvt_utf8(size_t __refs = 0);
+
+      ~codecvt_utf8();
+    };
+
+  template<typename _Elem, unsigned long _Maxcode = 0x10ffff,
+	   codecvt_mode _Mode = (codecvt_mode)0>
+    class codecvt_utf16 : public codecvt<_Elem, char, mbstate_t>
+    {
+    public:
+      explicit
+      codecvt_utf16(size_t __refs = 0);
+
+      ~codecvt_utf16();
+    };
+
+  template<typename _Elem, unsigned long _Maxcode = 0x10ffff,
+	   codecvt_mode _Mode = (codecvt_mode)0>
+    class codecvt_utf8_utf16 : public codecvt<_Elem, char, mbstate_t>
+    {
+    public:
+      explicit
+      codecvt_utf8_utf16(size_t __refs = 0);
+
+      ~codecvt_utf8_utf16();
+    };
+
+#define _GLIBCXX_CODECVT_SPECIALIZATION2(_NAME, _ELEM) \
+  template<> \
+    class _NAME<_ELEM> \
+    : public codecvt<_ELEM, char, mbstate_t> \
+    { \
+    public: \
+      typedef _ELEM			intern_type; \
+      typedef char			extern_type; \
+      typedef mbstate_t			state_type; \
+ \
+    protected: \
+      _NAME(unsigned long __maxcode, codecvt_mode __mode, size_t __refs) \
+      : codecvt(__refs), _M_maxcode(__maxcode), _M_mode(__mode) { } \
+ \
+      virtual \
+      ~_NAME(); \
+ \
+      virtual result \
+      do_out(state_type& __state, const intern_type* __from, \
+	     const intern_type* __from_end, const intern_type*& __from_next, \
+	     extern_type* __to, extern_type* __to_end, \
+	     extern_type*& __to_next) const; \
+ \
+      virtual result \
+      do_unshift(state_type& __state, \
+		 extern_type* __to, extern_type* __to_end, \
+		 extern_type*& __to_next) const; \
+ \
+      virtual result \
+      do_in(state_type& __state, \
+	     const extern_type* __from, const extern_type* __from_end, \
+	     const extern_type*& __from_next, \
+	     intern_type* __to, intern_type* __to_end, \
+	     intern_type*& __to_next) const; \
+ \
+      virtual \
+      int do_encoding() const throw(); \
+ \
+      virtual \
+      bool do_always_noconv() const throw(); \
+ \
+      virtual \
+      int do_length(state_type&, const extern_type* __from, \
+		    const extern_type* __end, size_t __max) const; \
+ \
+      virtual int \
+      do_max_length() const throw(); \
+ \
+    private: \
+      unsigned long	_M_maxcode; \
+      codecvt_mode	_M_mode; \
+    }
+
+#define _GLIBCXX_CODECVT_SPECIALIZATION(_NAME, _ELEM) \
+  _GLIBCXX_CODECVT_SPECIALIZATION2(__ ## _NAME ## _base, _ELEM); \
+  template<unsigned long _Maxcode, codecvt_mode _Mode> \
+    class _NAME<_ELEM, _Maxcode, _Mode> \
+    : public __ ## _NAME ## _base<_ELEM> \
+    { \
+    public: \
+      explicit \
+      _NAME(size_t __refs = 0) \
+      : __ ## _NAME ## _base<_ELEM>(_Maxcode, _Mode, __refs) { } \
+    }
+
+  template<typename _Elem> class __codecvt_utf8_base;
+  template<typename _Elem> class __codecvt_utf16_base;
+  template<typename _Elem> class __codecvt_utf8_utf16_base;
+
+  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8, char16_t);
+  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf16, char16_t);
+  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8_utf16, char16_t);
+
+  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8, char32_t);
+  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf16, char32_t);
+  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8_utf16, char32_t);
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8, wchar_t);
+  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf16, wchar_t);
+  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8_utf16, wchar_t);
+#endif
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+
+#endif // _GLIBCXX_USE_C99_STDINT_TR1
+
+#endif
+
+#endif /* _GLIBCXX_CODECVT */

libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc

+// 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-require-cstdint "" }
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <codecvt>
+#include <type_traits>
+#include <testsuite_hooks.h>
+
+template<typename C>
+  using codecvt = std::codecvt<C, char, std::mbstate_t>;
+
+using std::is_base_of;
+
+static_assert(
+    is_base_of<codecvt<char16_t>, std::codecvt_utf16<char16_t>>::value,
+    "codecvt_utf16<char16_t> has wrong base class");
+
+static_assert(
+    is_base_of<codecvt<char32_t>, std::codecvt_utf16<char32_t>>::value,
+    "codecvt_utf16<char32_t> has wrong base class");

libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc

+// 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-require-cstdint "" }
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <codecvt>
+#include <type_traits>
+#include <testsuite_hooks.h>
+
+template<typename C>
+  using codecvt = std::codecvt<C, char, std::mbstate_t>;
+
+using std::is_base_of;
+
+static_assert(
+    is_base_of<codecvt<char16_t>, std::codecvt_utf8<char16_t>>::value,
+    "codecvt_utf8<char16_t> has wrong base class");
+
+static_assert(
+    is_base_of<codecvt<char32_t>, std::codecvt_utf8<char32_t>>::value,
+    "codecvt_utf8<char32_t> has wrong base class");

libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc

+// 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-require-cstdint "" }
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <codecvt>
+#include <type_traits>
+#include <testsuite_hooks.h>
+
+template<typename C>
+  using codecvt = std::codecvt<C, char, std::mbstate_t>;
+
+using std::is_base_of;
+
+static_assert(
+    is_base_of<codecvt<char16_t>, std::codecvt_utf8_utf16<char16_t>>::value,
+    "codecvt_utf8_utf16<char16_t> has wrong base class");
+
+static_assert(
+    is_base_of<codecvt<char32_t>, std::codecvt_utf8_utf16<char32_t>>::value,
+    "codecvt_utf8_utf16<char32_t> has wrong base class");