]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
projects / thirdparty / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 60a1663)
Fix std::wstring allocator tests
authorJonathan Wakely <jwakely@redhat.com>
Sat, 6 Aug 2016 12:21:46 +0000 (13:21 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Sat, 6 Aug 2016 12:21:46 +0000 (13:21 +0100)
* 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

libstdc++-v3/ChangeLog patch | blob | blame | history
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc patch | blob | blame | history
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc patch | blob | blame | history
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc patch | blob | blame | history
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc patch | blob | blame | history
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc patch | blob | blame | history
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/noexcept.cc patch | blob | blame | history
libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc patch | blob | blame | history

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ae8c9b9f7afe2a5e6acae2d96aa6b1c4a8fb8038..392b79ad165985c6cf5def9ce4b80979829ee7a5 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,23 @@
 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
        2016-01-18  Jonathan Wakely  <jwakely@redhat.com>
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc
index c95e2eff59992806516281bc24d9a98e4a5d0cf0..8a51279b2d4f5ac5615aead7d29384f1a9388868 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc
@@ -21,9 +21,9 @@
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
  
-#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T)
-using C = char;
-const C c = 'a';
+#if _GLIBCXX_USE_CXX11_ABI
+using C = wchar_t;
+const C c = L'a';
 using traits = std::char_traits<C>;
 
 using __gnu_test::propagating_allocator;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc
index f69dff74effe7e0b5dcb80a6fe304d0ec8d8e3ea..ed8feb7b33e4e6b3b9e227f6dd2b6d39ef82123b 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc
@@ -21,9 +21,9 @@
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
  
-#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T)
-using C = char;
-const C c = 'a';
+#if _GLIBCXX_USE_CXX11_ABI
+using C = wchar_t;
+const C c = L'a';
 using traits = std::char_traits<C>;
 
 using __gnu_test::propagating_allocator;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc
index b97a58a5ecce0696da30e554505054ef1a3b6205..8643785decbb1ccd6ead5a700428c89989eb7b52 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc
@@ -22,7 +22,7 @@
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
  
-#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T)
+#if _GLIBCXX_USE_CXX11_ABI
 using C = wchar_t;
 const C c = L'a';
 using traits = std::char_traits<C>;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc
index 88927a631245b21b3478234ce147af7467925a3b..55d18788e5a2bf02a00f1ec1b13d982d8dd50c17 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc
@@ -21,9 +21,9 @@
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
 
-#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T)
-using C = char;
-const C c = 'a';
+#if _GLIBCXX_USE_CXX11_ABI
+using C = wchar_t;
+const C c = L'a';
 using traits = std::char_traits<C>;
 
 using __gnu_test::uneq_allocator;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc
index 45283a71c70fa457fc49ee10ef9980a0c03ef31b..7c28fa87d8df368314f93164c9114150c564a5d1 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc
@@ -21,9 +21,9 @@
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
  
-#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T)
-using C = char;
-const C c = 'a';
+#if _GLIBCXX_USE_CXX11_ABI
+using C = wchar_t;
+const C c = L'a';
 using traits = std::char_traits<C>;
 
 using __gnu_test::propagating_allocator;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/noexcept.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/noexcept.cc
index 5fb3c1bd8a5a2bed2375d86a9719810222a2a6df..77da966bdf994f603a8dec81fb844a49f13ac55c 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/noexcept.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/noexcept.cc
@@ -21,9 +21,9 @@
 #include <string>
 #include <testsuite_allocator.h>
  
-#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T)
-using C = char;
-const C c = 'a';
+#if _GLIBCXX_USE_CXX11_ABI
+using C = wchar_t;
+const C c = L'a';
 using traits = std::char_traits<C>;
 
 using __gnu_test::propagating_allocator;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc
index 5490f9e7d032552031ca723ec415f3baf636fb5e..23b8ac0061f8d704bb5d4e79444dbe5910ab2ecd 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc
@@ -21,9 +21,9 @@
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
  
-#if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T)
-using C = char;
-const C c = 'a';
+#if _GLIBCXX_USE_CXX11_ABI
+using C = wchar_t;
+const C c = L'a';
 using traits = std::char_traits<C>;
 
 using __gnu_test::propagating_allocator;
Mirror of https://gcc.gnu.org/git/gcc.git