2003-12-06 Benjamin Kosnik <bkoz@redhat.com>

	* testsuite/ext/enc_filebuf/char/13189.cc: Guard for __enc_traits.
	* testsuite/ext/enc_filebuf/wchar_t/13189.cc: Same.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74380 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 788500a..9bd1553 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2003-12-06  Benjamin Kosnik  <bkoz@redhat.com>
 
+       * testsuite/ext/enc_filebuf/char/13189.cc: Guard for __enc_traits.
+       * testsuite/ext/enc_filebuf/wchar_t/13189.cc: Same.
+       
+2003-12-06  Benjamin Kosnik  <bkoz@redhat.com>
+
        PR libstdc++/11691 
        * include/ext/stdio_filebuf.h (stdio_filebuf::stdio_filebuf):
        Remove __del argument to file descriptor constructor.

diff --git a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc
index 57c0871..f4c3fe2 100644 (file)
--- a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc
+++ b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc
@@ -16,13 +16,14 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
+#ifdef _GLIBCXX_USE___ENC_TRAITS
+
 #include <ext/enc_filebuf.h>
 #include <testsuite_hooks.h>
 
-int main()
+void test01()
 {
   using namespace std;
-
   typedef __enc_traits state_type;
   typedef char char_type;
   typedef __gnu_cxx::enc_filebuf<char_type> filebuf_type;
@@ -46,5 +47,14 @@ int main()
     {
       VERIFY( false );
     }
-  return 0;
+}
+
+#else
+void test01() { }
+#endif
+
+int main() 
+{ 
+  test01();
+  return 0; 
 }

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 7089b67..0fd9b0d 100644 (file)
--- a/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc
+++ b/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc
@@ -16,13 +16,14 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
+#ifdef _GLIBCXX_USE___ENC_TRAITS
+
 #include <ext/enc_filebuf.h>
 #include <testsuite_hooks.h>
 
-int main()
+void test01()
 {
   using namespace std;
-
   typedef __enc_traits state_type;
   typedef wchar_t char_type;
   typedef __gnu_cxx::enc_filebuf<char_type> filebuf_type;
@@ -46,5 +47,14 @@ int main()
     {
       VERIFY( false );
     }
-  return 0;
+}
+
+#else
+void test01() { }
+#endif
+
+int main() 
+{ 
+  test01();
+  return 0; 
 }