From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 2 Oct 2015 22:18:06 +0000 (+0100)
Subject: minimal.cc: Minor tweaks to match narrow char version.
X-Git-Tag: basepoints/gcc-7~4182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee216d80a5673aca7300e720eae1b25c2392662f;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 64841c9868c5..fd05a65f009c 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 713e0302ef60..b97a58a5ecce 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;
 }