aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2003-12-07 04:15:16 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2003-12-07 04:15:16 +0000
commit57616df1c3d047ac14ac29b3b0b25c2ea549550d (patch)
tree06355a898aa00eeaad1df881c9d69bf52307dceb
parente80213d249514d71ac7d6e25f95d59f756e15b14 (diff)
downloadgcc-57616df1c3d047ac14ac29b3b0b25c2ea549550d.zip
gcc-57616df1c3d047ac14ac29b3b0b25c2ea549550d.tar.gz
gcc-57616df1c3d047ac14ac29b3b0b25c2ea549550d.tar.bz2
13189.cc: Guard for __enc_traits.
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. From-SVN: r74380
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc16
-rw-r--r--libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc16
3 files changed, 31 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 788500a..9bd1553 100644
--- 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
--- 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
--- 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;
}