2001-06-19 Benjamin Kosnik <bkoz@redhat.com>

	* mknumeric_limits: Add static defintions, format.
	* testsuite/18_support/numeric_limits.cc (test02): Add test.

	* include/c_std/bits/std_cwchar.h: Include ctime.
	* testsuite/17_intro/header_cwchar.cc : Check.

	* include/c_std/bits/std_cwctype.h: Inject wctype.


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

3 files changed, 41 insertions, 4 deletions

diff --git a/libstdc++-v3/testsuite/17_intro/header_cwchar.cc b/libstdc++-v3/testsuite/17_intro/header_cwchar.cc
index cdc91b2a893..0f9974ddb13 100644
--- a/libstdc++-v3/testsuite/17_intro/header_cwchar.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_cwchar.cc
@@ -27,5 +27,8 @@ int main(void)
 {
   // Make sure size_t is in namespace std
   std::size_t i = 5;
+
+  std::tm mytime;
+
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/17_intro/header_cwctype.cc b/libstdc++-v3/testsuite/17_intro/header_cwctype.cc
index 8374a4602ca..ba315b49ce0 100644
--- a/libstdc++-v3/testsuite/17_intro/header_cwctype.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_cwctype.cc
@@ -22,11 +22,33 @@
 
 #if _GLIBCPP_USE_WCHAR_T
 #include <cwctype>
-  // Make sure wint_t is in namespace std
-  std::wint_t i = 5;
+// Make sure wint_t is in namespace std
+std::wint_t i = 5;
+
+// Make sure table 46 is in namespace std.
+using std::wctype_t;
+using std::wctrans_t;
+using std::iswalpha;
+using std::iswupper;
+using std::iswlower;
+using std::iswdigit;
+using std::iswxdigit;
+using std::iswalnum;
+using std::iswspace;
+using std::iswpunct;
+using std::iswprint;
+using std::iswgraph;
+using std::iswcntrl;
+using std::iswctype;
+using std::towctrans;
+using std::towlower;
+using std::towupper;
+using std::wctrans;
+using std::wctype;
 #endif
 
 int main(void)
 {
   return 0;
 }
+
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits.cc b/libstdc++-v3/testsuite/18_support/numeric_limits.cc
index f6173751f7f..4ff7f4a7059 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits.cc
@@ -1,6 +1,6 @@
 // 1999-08-23 bkoz
 
-// Copyright (C) 1999 Free Software Foundation
+// Copyright (C) 1999, 2001 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
@@ -80,9 +80,21 @@ bool test01()
   return test;
 }
 
+// test linkage of the generic bits
+void test02()
+{
+  typedef std::numeric_limits<B> b_nl_type;
+  
+  // Should probably do all of them...
+  const int* pi1 = &b_nl_type::digits;
+  const int* pi2 = &b_nl_type::digits10;
+  const int* pi3 = &b_nl_type::max_exponent10;
+  const bool* pb1 = &b_nl_type::traps;
+}
+
 int main()
 {
   test01();
-
+  test02();
   return 0;
 }