diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-10-02 23:18:06 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-10-02 23:18:06 +0100 |
| commit | ee216d80a5673aca7300e720eae1b25c2392662f (patch) | |
| tree | 1b3392dcb701ec092c04339ea44d537234bf7dfc | |
| parent | c980d0b4b7be9c8fe2da6d3bdd189dc0c3e61b49 (diff) | |
| download | gcc-ee216d80a5673aca7300e720eae1b25c2392662f.zip gcc-ee216d80a5673aca7300e720eae1b25c2392662f.tar.gz gcc-ee216d80a5673aca7300e720eae1b25c2392662f.tar.bz2 | |
minimal.cc: Minor tweaks to match narrow char version.
* testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc:
Minor tweaks to match narrow char version.
From-SVN: r228436
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 64841c9..fd05a65 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2015-10-02 Jonathan Wakely <jwakely@redhat.com> + * testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc: + Minor tweaks to match narrow char version. + * testsuite/21_strings/basic_string/allocator/char/minimal.cc: Guard explicit instantiation with check for new ABI. * testsuite/21_strings/basic_string/allocator/wchar_t/minimal.cc: 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 713e030..b97a58a 100644 --- 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 @@ -24,12 +24,12 @@ #if _GLIBCXX_USE_CXX11_ABI && defined(_GLIBCXX_USE_WCHAR_T) using C = wchar_t; -const C c = 'a'; +const C c = L'a'; using traits = std::char_traits<C>; using __gnu_test::SimpleAllocator; -template class std::basic_string<C,traits, SimpleAllocator<C>>; +template class std::basic_string<C, traits, SimpleAllocator<C>>; void test01() { @@ -47,4 +47,5 @@ void test01() { } int main() { test01(); + return 0; } |