From 5fd0af875415615aa6d0f561344120f7c56324aa Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@redhat.com>
Date: Wed, 28 Nov 2001 06:35:00 +0000
Subject: [PATCH] locale_facets.tcc: Formatting tweaks.

2001-11-27  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/locale_facets.tcc: Formatting tweaks.

	* testsuite/23_containers/map_operators.cc: Don't xfail.
	* testsuite/23_containers/set_operators.cc: Same.

From-SVN: r47400
---
 libstdc++-v3/ChangeLog                                |  7 +++++++
 libstdc++-v3/include/bits/locale_facets.tcc           | 11 -----------
 libstdc++-v3/testsuite/23_containers/map_operators.cc |  6 +++---
 libstdc++-v3/testsuite/23_containers/set_operators.cc | 10 ++++------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 70667905336..5ecc47f405e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-27  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/bits/locale_facets.tcc: Formatting tweaks.
+
+	* testsuite/23_containers/map_operators.cc: Don't xfail.
+	* testsuite/23_containers/set_operators.cc: Same.
+
 2001-11-27  Loren J. Rittle  <ljrittle@acm.org>
 	    Paolo Carlini  <pcarlini@unitus.it>
 
diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 3b9148e565c..e602e589a57 100644
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -403,7 +403,6 @@ namespace std
           if (__beg == __end)
             __err |= ios_base::eofbit;
         }
-
       return __beg;
     }
 #endif
@@ -430,7 +429,6 @@ namespace std
         __v = __l;
       else
         __err |= ios_base::failbit;
-
       return __beg;
     }
 
@@ -457,7 +455,6 @@ namespace std
         __v = static_cast<unsigned short>(__ul);
       else
         __err |= ios_base::failbit;
-
       return __beg;
     }
 
@@ -484,7 +481,6 @@ namespace std
         __v = static_cast<unsigned int>(__ul);
       else
         __err |= ios_base::failbit;
-
       return __beg;
     }
 
@@ -510,7 +506,6 @@ namespace std
         __v = __ul;
       else
         __err |= ios_base::failbit;
-
       return __beg;
     }
 
@@ -537,7 +532,6 @@ namespace std
         __v = __ll;
       else
         __err |= ios_base::failbit;
-
       return __beg;
     }
 
@@ -563,7 +557,6 @@ namespace std
         __v = __ull;
       else
         __err |= ios_base::failbit;
-
       return __beg;
     }
 #endif
@@ -593,7 +586,6 @@ namespace std
         __v = __f;
       else
         __err |= ios_base::failbit;
-
       return __beg;
     }
 
@@ -618,7 +610,6 @@ namespace std
         __v = __d;
       else
         __err |= ios_base::failbit;
-
       return __beg;
     }
 
@@ -665,7 +656,6 @@ namespace std
 #endif
       else
         __err |= ios_base::failbit;
-
       return __beg;
     }
 
@@ -1147,7 +1137,6 @@ namespace std
       // Iff valid sequence is not recognized.
       if (!__testvalid || !__units.size())
 	__err |= ios_base::failbit;
-
       return __beg; 
     }
 
diff --git a/libstdc++-v3/testsuite/23_containers/map_operators.cc b/libstdc++-v3/testsuite/23_containers/map_operators.cc
index 6df8a2b7c01..0ed96eb9fc5 100644
--- a/libstdc++-v3/testsuite/23_containers/map_operators.cc
+++ b/libstdc++-v3/testsuite/23_containers/map_operators.cc
@@ -40,10 +40,10 @@ void test01()
   std::map<unsigned, int>::iterator itr(mapByIndex.begin());
 
   // NB: notice, it's not mapByIndex!!
-  test &= itr != mapByName.end(); // { dg-error "match" "" { xfail *-*-* } }
-  test &= itr == mapByName.end(); // { dg-error "match" "" { xfail *-*-* } }
+  test &= itr != mapByName.end(); // { dg-error "no" } 
+  test &= itr == mapByName.end(); // { dg-error "no" } 
 }
-
+ 
 // http://gcc.gnu.org/ml/libstdc++/2000-11/msg00093.html
 void test02()
 {
diff --git a/libstdc++-v3/testsuite/23_containers/set_operators.cc b/libstdc++-v3/testsuite/23_containers/set_operators.cc
index 5bf9dba18f9..cafaff4818b 100644
--- a/libstdc++-v3/testsuite/23_containers/set_operators.cc
+++ b/libstdc++-v3/testsuite/23_containers/set_operators.cc
@@ -22,7 +22,7 @@
 
 #include <set>
 #include <string>
-make 
+
 // { dg-do compile }
 // { dg-excess-errors "" }
 
@@ -36,11 +36,9 @@ int main(void)
   
   std::set<unsigned int>::iterator itr(setByIndex.begin());
   
-
   // NB: it's not setByIndex!!
-  test &= itr != setByName.end(); 
-  // { dg-error "no match for" "" { xfail *-*-* } 41 }
-  test &= itr == setByName.end(); 
-  // { dg-error "no match for" "" { xfail *-*-* } 43 }
+  test &= itr != setByName.end(); // { dg-error "no" } 
+  test &= itr == setByName.end(); // { dg-error "no" } 
+
   return 0;
 }
-- 
2.30.2