iso646 fixes

[Nathan Myers]

Here are some minor fixes for <iso646> header conformance.
Note that bits/std_ciso646.h is just removed outright.

Nathan Myers
ncm at cantrip dot org

------------
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/ChangeLog,v
retrieving revision 1.26
diff -r1.26 ChangeLog
0a1,9
> 2000-05-16  Nathan C. Myers  <ncm@cantrip.org>
> 	* bits/std_ciso646.h: remove.
> 	* std/ciso646: gut.
> 	* testsuite/17_intro/header_ciso646.c: enable testing.
>       * src/Makefile.am, src/Makefile.in: remove mention of 
>       bits/std_ciso646.h
> 
>  	It appears that gcc-2.96 supports the keyword "and" now.
> 
Index: std/ciso646
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/std/ciso646,v
retrieving revision 1.1
diff -r1.1 ciso646
1,3c1
< #ifndef _CPP_ISO646
< #include <bits/std_ciso646.h>
< #endif
---
> // ciso646 -- This file is deliberately empty, per the standard.
Index: testsuite/17_intro/header_ciso646.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/17_intro/header_ciso646.cc,v
retrieving revision 1.1
diff -r1.1 header_ciso646.cc
103,105d102
< #if 0
<   // XXX g++ doesn't like this. Recognizes the keyword, but can't
<   // parse what's next.
111d107
< #endif
123,126c119
<   test01();
<   test02();
< 
<   return 0;
---
>   return !(test01() && test02())
128,131d120
< 
< 
< 
< 
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.8
diff -r1.8 Makefile.am
86c86
< 	bits/std_cassert.h bits/std_cwctype.h bits/std_ciso646.h \
---
> 	bits/std_cassert.h bits/std_cwctype.h \
Index: src/Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/src/Makefile.in,v
retrieving revision 1.8
diff -r1.8 Makefile.in
168c168
< 	bits/std_cassert.h bits/std_cwctype.h bits/std_ciso646.h \
---
> 	bits/std_cassert.h bits/std_cwctype.h \