git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix std::wstring allocator tests 

* testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc:
	Remove reundant check for _GLIBCXX_USE_WCHAR_T and fix char type.
	* testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/move.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/noexcept.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc:
	Likewise.

From-SVN: r239206
This commit is contained in:
Jonathan Wakely 2016-08-06 13:21:46 +01:00 committed by Jonathan Wakely
parent 60a1663f22
commit 2a35627433
8 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,23 @@
2016-08-06 Jonathan Wakely <jwakely@redhat.com> 2016-08-06 Jonathan Wakely <jwakely@redhat.com>
Backport from mainline
2016-08-02 Jonathan Wakely <jwakely@redhat.com>
* testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc:
Remove reundant check for _GLIBCXX_USE_WCHAR_T and fix char type.
* testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc:
Likewise.
* testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc:
Likewise.
* testsuite/21_strings/basic_string/allocator/wchar_t/move.cc:
Likewise.
* testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc:
Likewise.
* testsuite/21_strings/basic_string/allocator/wchar_t/noexcept.cc:
Likewise.
* testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc:
Likewise.
Backport from mainline Backport from mainline
2016-01-18 Jonathan Wakely <jwakely@redhat.com> 2016-01-18 Jonathan Wakely <jwakely@redhat.com>

6
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc
View File

@ -21,9 +21,9 @@
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
#include <testsuite_allocator.h> #include <testsuite_allocator.h>
#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T) #if _GLIBCXX_USE_CXX11_ABI
using C = char; using C = wchar_t;
const C c = 'a'; const C c = L'a';
using traits = std::char_traits<C>; using traits = std::char_traits<C>;
using __gnu_test::propagating_allocator; using __gnu_test::propagating_allocator;

6
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc
View File

@ -21,9 +21,9 @@
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
#include <testsuite_allocator.h> #include <testsuite_allocator.h>
#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T) #if _GLIBCXX_USE_CXX11_ABI
using C = char; using C = wchar_t;
const C c = 'a'; const C c = L'a';
using traits = std::char_traits<C>; using traits = std::char_traits<C>;
using __gnu_test::propagating_allocator; using __gnu_test::propagating_allocator;

2
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc
View File

@ -22,7 +22,7 @@
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
#include <testsuite_allocator.h> #include <testsuite_allocator.h>
#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T) #if _GLIBCXX_USE_CXX11_ABI
using C = wchar_t; using C = wchar_t;
const C c = L'a'; const C c = L'a';
using traits = std::char_traits<C>; using traits = std::char_traits<C>;

6
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc
View File

@ -21,9 +21,9 @@
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
#include <testsuite_allocator.h> #include <testsuite_allocator.h>
#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T) #if _GLIBCXX_USE_CXX11_ABI
using C = char; using C = wchar_t;
const C c = 'a'; const C c = L'a';
using traits = std::char_traits<C>; using traits = std::char_traits<C>;
using __gnu_test::uneq_allocator; using __gnu_test::uneq_allocator;

6
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc
View File

@ -21,9 +21,9 @@
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
#include <testsuite_allocator.h> #include <testsuite_allocator.h>
#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T) #if _GLIBCXX_USE_CXX11_ABI
using C = char; using C = wchar_t;
const C c = 'a'; const C c = L'a';
using traits = std::char_traits<C>; using traits = std::char_traits<C>;
using __gnu_test::propagating_allocator; using __gnu_test::propagating_allocator;

6
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/noexcept.cc
View File

@ -21,9 +21,9 @@
#include <string> #include <string>
#include <testsuite_allocator.h> #include <testsuite_allocator.h>
#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T) #if _GLIBCXX_USE_CXX11_ABI
using C = char; using C = wchar_t;
const C c = 'a'; const C c = L'a';
using traits = std::char_traits<C>; using traits = std::char_traits<C>;
using __gnu_test::propagating_allocator; using __gnu_test::propagating_allocator;

6
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc
View File

@ -21,9 +21,9 @@
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
#include <testsuite_allocator.h> #include <testsuite_allocator.h>
#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T) #if _GLIBCXX_USE_CXX11_ABI
using C = char; using C = wchar_t;
const C c = 'a'; const C c = L'a';
using traits = std::char_traits<C>; using traits = std::char_traits<C>;
using __gnu_test::propagating_allocator; using __gnu_test::propagating_allocator;