isctype.cc (test01): Fix mixed line-endings introduced in last change.

	* testsuite/28_regex/traits/char/isctype.cc (test01): Fix
	mixed line-endings introduced in last change.

From-SVN: r220682

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 394017c84a15f4108f3178a0e2ecf9fdb6e3dcb6..63bcfae6192beaea89841cc5736cccbf266b5c35 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-13  Matthew Wahab  <matthew.wahab@arm.com>
+
+       * testsuite/28_regex/traits/char/isctype.cc (test01): Fix
+       mixed line-endings introduced in last change.
+
 2015-02-12  Matthew Wahab  <matthew.wahab@arm.com>
 
        * testsuite/28_regex/traits/char/isctype.cc (test01): Replace test

diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc
index 0a1071c11507b4636bef4723dbc0593fe54c24c0..8f71910aef162b8a11374f049006b19f8ea30ca7 100644 (file)
--- a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc
@@ -51,14 +51,14 @@ test01()
   VERIFY(!t.isctype('e', t.lookup_classname(range(upper))));
   VERIFY( t.isctype('e', t.lookup_classname(range(lower))));
   VERIFY(!t.isctype('e', t.lookup_classname(range(nothing))));
-  VERIFY(!t.isctype('_', t.lookup_classname(range(digit))));\r
-  VERIFY( t.isctype(' ', t.lookup_classname(range(blank))));\r
-  VERIFY( t.isctype('\t', t.lookup_classname(range(blank))));\r
-#if defined (NEWLINE_IN_CLASS_BLANK)\r
-  /* On some targets, '\n' is in class 'blank'.\r
-     See https://gcc.gnu.org/ml/gcc-patches/2015-02/msg00059.html.  */\r
-  VERIFY( t.isctype('\n', t.lookup_classname(range(blank))));\r
-#else\r
+  VERIFY(!t.isctype('_', t.lookup_classname(range(digit))));
+  VERIFY( t.isctype(' ', t.lookup_classname(range(blank))));
+  VERIFY( t.isctype('\t', t.lookup_classname(range(blank))));
+#if defined (NEWLINE_IN_CLASS_BLANK)
+  /* On some targets, '\n' is in class 'blank'.
+     See https://gcc.gnu.org/ml/gcc-patches/2015-02/msg00059.html.  */
+  VERIFY( t.isctype('\n', t.lookup_classname(range(blank))));
+#else
   VERIFY(!t.isctype('\n', t.lookup_classname(range(blank))));
 #endif
   VERIFY( t.isctype('t', t.lookup_classname(range(upper), true)));