From: Benjamin Kosnik <bkoz@redhat.com>
Date: Sat, 17 Jan 2004 00:51:35 +0000 (+0000)
Subject: 13189.cc: Fix guards.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d517f626e1d4a6c079f9ca3bdd09886a6c6785e3;p=gcc.git

13189.cc: Fix guards.


2004-01-16  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/ext/enc_filebuf/char/13189.cc: Fix guards.
	* testsuite/ext/enc_filebuf/wchar_t/13189.cc: Same.

From-SVN: r76017
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9e45eb0ce3b..c4fb706ed90 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-16  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/ext/enc_filebuf/char/13189.cc: Fix guards.
+	* testsuite/ext/enc_filebuf/wchar_t/13189.cc: Same.	
+
 2004-01-16  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* testsuite/testsuite_hooks.cc (try_mkfifo): Avoid calling
diff --git a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc
index f4c3fe29957..c853ecb6e88 100644
--- a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc
+++ b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2004 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -17,12 +17,13 @@
 // USA.
 
 #ifdef _GLIBCXX_USE___ENC_TRAITS
-
 #include <ext/enc_filebuf.h>
+#endif
 #include <testsuite_hooks.h>
 
 void test01()
 {
+#ifdef _GLIBCXX_USE___ENC_TRAITS
   using namespace std;
   typedef __enc_traits state_type;
   typedef char char_type;
@@ -47,11 +48,8 @@ void test01()
     {
       VERIFY( false );
     }
-}
-
-#else
-void test01() { }
 #endif
+}
 
 int main() 
 { 
diff --git a/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc b/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc
index 0fd9b0dd3df..1e5a933add5 100644
--- a/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc
+++ b/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2004 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -17,12 +17,13 @@
 // USA.
 
 #ifdef _GLIBCXX_USE___ENC_TRAITS
-
 #include <ext/enc_filebuf.h>
+#endif
 #include <testsuite_hooks.h>
 
 void test01()
 {
+#ifdef _GLIBCXX_USE___ENC_TRAITS
   using namespace std;
   typedef __enc_traits state_type;
   typedef wchar_t char_type;
@@ -47,11 +48,8 @@ void test01()
     {
       VERIFY( false );
     }
-}
-
-#else
-void test01() { }
 #endif
+}
 
 int main() 
 {