This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Re: backward -> deprecated
- To: jason at redhat dot com, neil at daikokuya dot demon dot co dot uk, libstdc++ at gcc dot gnu dot org
- Subject: Re: backward -> deprecated
- From: Benjamin Kosnik <bkoz at redhat dot com>
- Date: Thu, 5 Apr 2001 16:12:42 -0700
Neil, here's the end goal with these changes.
End users compiling code with antiquated or deprecated headers, say
the following:
#include <algo.h>
#include <iostream.h>
int
main()
{
char buffer[256];
cin >> buffer; // Why does nothing is read here !!!! (TO).
cout << "Read: " << buffer << endl;
}
would get something similar to:
<bkoz@fillmore> /mnt/hd/bliss/src.gcc/libstdc++-v3.cvs/testsuite %g++ test2.cc
test2.cc:3:3: warning: #warning "test2.cc includes at least one deprecated or antiquated header."
test2.cc:4:3: warning: #warning "Please use the <X> file instead of <X.h> file for "C++" includes"
test2.cc:5:3: warning: #warning "and use the <cX> file instead of <X.h> file for "C" includes."
test2.cc:6:3: warning: #warning "To disable this warning use -Wno-deprecated."
There has been a lot of discussion about this on the libstdc++ lists
over the last three months. Summarizing it quickly, here is what the
consensus is:
1) backwards headers should be installed in their own directory, not
the top-level libstdc++-v3 include directory.
2) using backwards headers in code should give a warning, and
-Wno-deprecated should turn that warning off.
I've broken up these objectives into two sets of patches.
Part one: Put libstdc++-v3/include/backward headers into separate
backwards directory when installing.
http://gcc.gnu.org/ml/gcc-patches/2001-04/msg00339.html
http://gcc.gnu.org/ml/gcc-patches/2001-04/msg00341.html
Part two: Warn about using backward/*.h files.
I've got a patch to do this (enclosed in this email), but....
I'm hoping that you've got a better way to do this. For one, my patch
doesn't work (I'm not quite sure why: __GXX_DEPRECATED is being
defined correctly, but I suspect warnings/errors are off for all
libstdc++ headers?)
In addition, it would be nice if only the first backward header gave
the deprecated message, instead of every deprecated header giving
it. Most of the deprecated headers include other deprecated headers,
so we get cascading warning messages with this approach. I seem to
remember that g++ has a warning message for -fguiding-decls that only
warns the first time it finds things, not everytime.
I'm hoping that these patches explain what I'm trying to do, and that
you can perhaps suggest a more elegant way to accomplish part two of
the goal?
thanks,
benjamin
gcc/cp/
2001-04-04 Benjamin Kosnik <bkoz@redhat.com>
* lang-specs.h: Add __GXX_DEPRECATED.
Index: lang-specs.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/lang-specs.h,v
retrieving revision 1.41
diff -c -p -r1.41 lang-specs.h
*** lang-specs.h 2001/03/02 01:03:46 1.41
--- lang-specs.h 2001/04/05 23:07:29
*************** Boston, MA 02111-1307, USA. */
*** 36,47 ****
--- 36,49 ----
/* cc1plus has an integrated ISO C preprocessor. We should invoke
the external preprocessor if -save-temps is given. */
"%{E|M|MM:cpp0 -lang-c++ -D_GNU_SOURCE %{!no-gcc:-D__GNUG__=%v1}\
+ %{!Wno-deprecated:-D__GXX_DEPRECATED}\
%{!fno-exceptions:-D__EXCEPTIONS}\
%{!fno-new-abi:-D__GXX_ABI_VERSION=100}\
%{ansi:-D__STRICT_ANSI__ -trigraphs -$} %(cpp_options)}\
%{!E:%{!M:%{!MM:\
%{save-temps:cpp0 -lang-c++ -D_GNU_SOURCE \
%{!no-gcc:-D__GNUG__=%v1}\
+ %{!Wno-deprecated:-D__GXX_DEPRECATED}\
%{!fno-exceptions:-D__EXCEPTIONS}\
%{!fno-new-abi:-D__GXX_ABI_VERSION=100}\
%{ansi:-D__STRICT_ANSI__ -trigraphs -$}\
*************** Boston, MA 02111-1307, USA. */
*** 49,54 ****
--- 51,57 ----
cc1plus %{save-temps:-fpreprocessed %b.ii}\
%{!save-temps:%(cpp_options)\
%{!no-gcc:-D__GNUG__=%v1} -D_GNU_SOURCE \
+ %{!Wno-deprecated:-D__GXX_DEPRECATED}\
%{!fno-exceptions:-D__EXCEPTIONS}\
%{!fno-new-abi:-D__GXX_ABI_VERSION=100}\
%{ansi:-D__STRICT_ANSI__}}\
/libstdc++-v3
2001-04-05 Benjamin Kosnik <bkoz@redhat.com>
Warn when using backward headers.
* include/backward/algo.h: Include warning file.
* include/backward/vector.h: Same.
* include/backward/tree.h: Same.
* include/backward/tempbuf.h: Same.
* include/backward/strstream: Same.
* include/backward/streambuf.h: Same.
* include/backward/stream.h: Same.
* include/backward/stack.h: Same.
* include/backward/slist.h: Same.
* include/backward/set.h: Same.
* include/backward/rope.h:
* include/backward/queue.h: Same.
* include/backward/pair.h: Same.
* include/backward/ostream.h: Same.
* include/backward/new.h: Same.
* include/backward/multiset.h: Same.
* include/backward/multimap.h: Same.
* include/backward/map.h: Same.
* include/backward/list.h: Same.
* include/backward/iterator.h: Same.
* include/backward/istream.h: Same.
* include/backward/iostream.h:
* include/backward/iomanip.h:
* include/backward/heap.h: Same.
* include/backward/hashtable.h:
* include/backward/hash_set.h:
* include/backward/hash_map.h:
* include/backward/function.h:
* include/backward/fstream.h:
* include/backward/deque.h:
* include/backward/defalloc.h: Same.
* include/backward/complex.h: Same.
* include/backward/bvector.h:
* include/backward/alloc.h:
* include/backward/algobase.h: Same.
* include/backward/backward_warning.h: New file.
* src/Makefile.am (backward_headers): Add backward_warning.h
* src/Makefile.in: Regenerate.
Index: include/backward/algo.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/algo.h,v
retrieving revision 1.3
diff -c -p -r1.3 algo.h
*** algo.h 2001/03/31 20:15:42 1.3
--- algo.h 2001/04/05 22:56:43
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_ALGO_H
#define _CPP_BACKWARD_ALGO_H 1
+ #include "backward_warning.h"
#include "algobase.h"
#include "tempbuf.h"
#include "iterator.h"
Index: include/backward/algobase.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/algobase.h,v
retrieving revision 1.3
diff -c -p -r1.3 algobase.h
*** algobase.h 2001/03/31 20:15:42 1.3
--- algobase.h 2001/04/05 22:56:44
***************
*** 26,31 ****
--- 26,32 ----
#ifndef _CPP_BACKWARD_ALGOBASE_H
#define _CPP_BACKWARD_ALGOBASE_H 1
+ #include "backward_warning.h"
#include "pair.h"
#include "iterator.h"
#include <bits/stl_algobase.h>
Index: include/backward/alloc.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/alloc.h,v
retrieving revision 1.4
diff -c -p -r1.4 alloc.h
*** alloc.h 2001/03/31 20:15:42 1.4
--- alloc.h 2001/04/05 22:56:44
***************
*** 14,19 ****
--- 14,20 ----
#ifndef _CPP_BACKWARD_ALLOC_H
#define _CPP_BACKWARD_ALLOC_H 1
+ #include "backward_warning.h"
#include <bits/c++config.h>
#include <bits/stl_alloc.h>
Index: include/backward/backward_warning.h
===================================================================
RCS file: backward_warning.h
diff -N backward_warning.h
*** /dev/null Tue May 5 13:32:27 1998
--- backward_warning.h Thu Apr 5 15:56:44 2001
***************
*** 0 ****
--- 1,8 ----
+
+ #ifdef __GXX_DEPRECATED
+ # warning __FILE__
+ # warning "includes at least one deprecated or antiquated header."
+ # warning "Please use the <X> file instead of <X.h> file for "C++" includes"
+ # warning "and use the <cX> file instead of <X.h> file for "C" includes."
+ # warning "To disable this warning use -Wno-deprecated."
+ #endif
Index: include/backward/bvector.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/bvector.h,v
retrieving revision 1.4
diff -c -p -r1.4 bvector.h
*** bvector.h 2001/03/31 20:15:42 1.4
--- bvector.h 2001/04/05 22:56:44
***************
*** 28,33 ****
--- 28,34 ----
#define __SGI_STL_BVECTOR_H
+ #include "backward_warning.h"
#include <bits/std_vector.h>
using std::bit_vector;
Index: include/backward/complex.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/complex.h,v
retrieving revision 1.2
diff -c -p -r1.2 complex.h
*** complex.h 2000/11/21 23:44:50 1.2
--- complex.h 2001/04/05 22:56:44
***************
*** 28,33 ****
--- 28,34 ----
#ifndef _CPP_BACKWARD_COMPLEX_H
#define _CPP_BACKWARD_COMPLEX_H 1
+ #include "backward_warning.h"
#include <bits/std_complex.h>
using std::complex;
Index: include/backward/defalloc.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/defalloc.h,v
retrieving revision 1.1
diff -c -p -r1.1 defalloc.h
*** defalloc.h 2000/10/05 11:27:00 1.1
--- defalloc.h 2001/04/05 22:56:44
***************
*** 26,31 ****
--- 26,32 ----
#ifndef _CPP_BACKWARD_DEFALLOC_H
#define _CPP_BACKWARD_DEFALLOC_H 1
+ #include "backward_warning.h"
#include "new.h"
#include <stddef.h>
#include <stdlib.h>
Index: include/backward/deque.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/deque.h,v
retrieving revision 1.2
diff -c -p -r1.2 deque.h
*** deque.h 2001/03/04 21:34:00 1.2
--- deque.h 2001/04/05 22:56:44
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_DEQUE_H
#define _CPP_BACKWARD_DEQUE_H 1
+ #include "backward_warning.h"
#include "algobase.h"
#include "alloc.h"
#include <bits/std_deque.h>
Index: include/backward/fstream.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/fstream.h,v
retrieving revision 1.5
diff -c -p -r1.5 fstream.h
*** fstream.h 2001/04/04 18:04:52 1.5
--- fstream.h 2001/04/05 22:56:44
***************
*** 28,33 ****
--- 28,34 ----
#ifndef _CPP_BACKWARD_FSTREAM_H
#define _CPP_BACKWARD_FSTREAM_H 1
+ #include "backward_warning.h"
#include <bits/std_fstream.h>
using std::filebuf;
Index: include/backward/function.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/function.h,v
retrieving revision 1.5
diff -c -p -r1.5 function.h
*** function.h 2001/03/31 20:15:42 1.5
--- function.h 2001/04/05 22:56:44
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_FUNCTION_H
#define _CPP_BACKWARD_FUNCTION_H 1
+ #include "backward_warning.h"
#include <bits/c++config.h>
#include <stddef.h>
#include <bits/stl_function.h>
Index: include/backward/hash_map.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/hash_map.h,v
retrieving revision 1.3
diff -c -p -r1.3 hash_map.h
*** hash_map.h 2001/03/31 20:15:42 1.3
--- hash_map.h 2001/04/05 22:56:45
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_HASH_MAP_H
#define _CPP_BACKWARD_HASH_MAP_H 1
+ #include "backward_warning.h"
#include "algobase.h"
#include <ext/hash_map>
Index: include/backward/hash_set.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/hash_set.h,v
retrieving revision 1.3
diff -c -p -r1.3 hash_set.h
*** hash_set.h 2001/03/31 20:15:42 1.3
--- hash_set.h 2001/04/05 22:56:45
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_HASH_SET_H
#define _CPP_BACKWARD_HASH_SET_H 1
+ #include "backward_warning.h"
#include "algobase.h"
#include <ext/hash_set>
Index: include/backward/hashtable.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/hashtable.h,v
retrieving revision 1.3
diff -c -p -r1.3 hashtable.h
*** hashtable.h 2001/03/12 18:49:31 1.3
--- hashtable.h 2001/04/05 22:56:45
***************
*** 31,36 ****
--- 31,37 ----
#ifndef _CPP_BACKWARD_HASHTABLE_H
#define _CPP_BACKWARD_HASHTABLE_H 1
+ #include "backward_warning.h"
#include <ext/stl_hashtable.h>
#include "algo.h"
#include "alloc.h"
Index: include/backward/heap.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/heap.h,v
retrieving revision 1.3
diff -c -p -r1.3 heap.h
*** heap.h 2001/03/04 21:34:00 1.3
--- heap.h 2001/04/05 22:56:45
***************
*** 26,31 ****
--- 26,32 ----
#ifndef _CPP_BACKWARD_HEAP_H
#define _CPP_BACKWARD_HEAP_H 1
+ #include "backward_warning.h"
#include <bits/c++config.h>
#include <bits/stl_heap.h>
Index: include/backward/iomanip.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/iomanip.h,v
retrieving revision 1.5
diff -c -p -r1.5 iomanip.h
*** iomanip.h 2001/03/31 20:15:42 1.5
--- iomanip.h 2001/04/05 22:56:45
***************
*** 28,33 ****
--- 28,34 ----
#ifndef _CPP_BACKWARD_IOMANIP_H
#define _CPP_BACKWARD_IOMANIP_H 1
+ #include "backward_warning.h"
#include "iostream.h"
#include <bits/std_iomanip.h>
Index: include/backward/iostream.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/iostream.h,v
retrieving revision 1.4
diff -c -p -r1.4 iostream.h
*** iostream.h 2001/02/26 20:33:09 1.4
--- iostream.h 2001/04/05 22:56:45
***************
*** 28,33 ****
--- 28,34 ----
#ifndef _CPP_BACKWARD_IOSTREAM_H
#define _CPP_BACKWARD_IOSTREAM_H 1
+ #include "backward_warning.h"
#include <bits/std_iostream.h>
using std::iostream;
Index: include/backward/istream.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/istream.h,v
retrieving revision 1.4
diff -c -p -r1.4 istream.h
*** istream.h 2001/03/31 20:15:42 1.4
--- istream.h 2001/04/05 22:56:45
***************
*** 28,33 ****
--- 28,34 ----
#ifndef _CPP_BACKWARD_ISTREAM_H
#define _CPP_BACKWARD_ISTREAM_H 1
+ #include "backward_warning.h"
#include "iostream.h"
#endif
Index: include/backward/iterator.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/iterator.h,v
retrieving revision 1.3
diff -c -p -r1.3 iterator.h
*** iterator.h 2001/03/31 20:15:42 1.3
--- iterator.h 2001/04/05 22:56:46
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_ITERATOR_H
#define _CPP_BACKWARD_ITERATOR_H 1
+ #include "backward_warning.h"
#include "function.h"
#include <stddef.h>
#include "iostream.h"
Index: include/backward/list.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/list.h,v
retrieving revision 1.3
diff -c -p -r1.3 list.h
*** list.h 2001/03/31 20:15:42 1.3
--- list.h 2001/04/05 22:56:46
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_LIST_H
#define _CPP_BACKWARD_LIST_H 1
+ #include "backward_warning.h"
#include "algobase.h"
#include "alloc.h"
#include <bits/std_list.h>
Index: include/backward/map.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/map.h,v
retrieving revision 1.3
diff -c -p -r1.3 map.h
*** map.h 2001/03/31 20:15:42 1.3
--- map.h 2001/04/05 22:56:46
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_MAP_H
#define _CPP_BACKWARD_MAP_H 1
+ #include "backward_warning.h"
#include "tree.h"
#include <bits/std_map.h>
Index: include/backward/multimap.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/multimap.h,v
retrieving revision 1.3
diff -c -p -r1.3 multimap.h
*** multimap.h 2001/03/31 20:15:42 1.3
--- multimap.h 2001/04/05 22:56:46
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_MULTIMAP_H
#define _CPP_BACKWARD_MULTIMAP_H 1
+ #include "backward_warning.h"
#include "tree.h"
#include <bits/std_map.h>
Index: include/backward/multiset.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/multiset.h,v
retrieving revision 1.3
diff -c -p -r1.3 multiset.h
*** multiset.h 2001/03/31 20:15:42 1.3
--- multiset.h 2001/04/05 22:56:46
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_MULTISET_H
#define _CPP_BACKWARD_MULTISET_H 1
+ #include "backward_warning.h"
#include "tree.h"
#include <bits/std_set.h>
Index: include/backward/new.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/new.h,v
retrieving revision 1.3
diff -c -p -r1.3 new.h
*** new.h 2000/11/23 06:46:31 1.3
--- new.h 2001/04/05 22:56:46
***************
*** 30,35 ****
--- 30,36 ----
#ifndef _CPP_BACKWARD_NEW_H
#define _CPP_BACKWARD_NEW_H 1
+ #include "backward_warning.h"
#include <new>
using std::bad_alloc;
Index: include/backward/ostream.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/ostream.h,v
retrieving revision 1.4
diff -c -p -r1.4 ostream.h
*** ostream.h 2001/03/31 20:15:42 1.4
--- ostream.h 2001/04/05 22:56:46
***************
*** 28,33 ****
--- 28,34 ----
#ifndef _CPP_BACKWARD_OSTREAM_H
#define _CPP_BACKWARD_OSTREAM_H 1
+ #include "backward_warning.h"
#include "iostream.h"
#endif
Index: include/backward/pair.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/pair.h,v
retrieving revision 1.5
diff -c -p -r1.5 pair.h
*** pair.h 2001/03/31 20:15:42 1.5
--- pair.h 2001/04/05 22:56:46
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_PAIR_H
#define _CPP_BACKWARD_PAIR_H 1
+ #include "backward_warning.h"
#include <bits/c++config.h>
#include <bits/stl_pair.h>
Index: include/backward/queue.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/queue.h,v
retrieving revision 1.1
diff -c -p -r1.1 queue.h
*** queue.h 2001/03/31 20:15:42 1.1
--- queue.h 2001/04/05 22:56:47
***************
*** 28,33 ****
--- 28,34 ----
#ifndef _CPP_BACKWARD_QUEUE_H
#define _CPP_BACKWARD_QUEUE_H 1
+ #include "backward_warning.h"
#include <bits/std_queue.h>
using std::queue;
Index: include/backward/rope.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/rope.h,v
retrieving revision 1.4
diff -c -p -r1.4 rope.h
*** rope.h 2001/03/31 20:15:42 1.4
--- rope.h 2001/04/05 22:56:47
***************
*** 14,19 ****
--- 14,20 ----
#ifndef _CPP_BACKWARD_ROPE_H
#define _CPP_BACKWARD_ROPE_H 1
+ #include "backward_warning.h"
#include "hashtable.h"
#include <ext/rope>
Index: include/backward/set.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/set.h,v
retrieving revision 1.3
diff -c -p -r1.3 set.h
*** set.h 2001/03/31 20:15:42 1.3
--- set.h 2001/04/05 22:56:47
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_SET_H
#define _CPP_BACKWARD_SET_H 1
+ #include "backward_warning.h"
#include "tree.h"
#include <bits/std_set.h>
Index: include/backward/slist.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/slist.h,v
retrieving revision 1.2
diff -c -p -r1.2 slist.h
*** slist.h 2001/03/04 21:34:00 1.2
--- slist.h 2001/04/05 22:56:47
***************
*** 15,20 ****
--- 15,21 ----
#ifndef _CPP_BACKWARD_SLIST_H
#define _CPP_BACKWARD_SLIST_H 1
+ #include "backward_warning.h"
#include <ext/slist>
using std::slist;
Index: include/backward/stack.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/stack.h,v
retrieving revision 1.3
diff -c -p -r1.3 stack.h
*** stack.h 2001/03/31 20:15:42 1.3
--- stack.h 2001/04/05 22:56:47
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_STACK_H
#define _CPP_BACKWARD_STACK_H 1
+ #include "backward_warning.h"
#include "vector.h"
#include "deque.h"
#include "heap.h"
Index: include/backward/stream.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/stream.h,v
retrieving revision 1.4
diff -c -p -r1.4 stream.h
*** stream.h 2001/03/31 20:15:42 1.4
--- stream.h 2001/04/05 22:56:47
***************
*** 28,33 ****
--- 28,34 ----
#ifndef _CPP_BACKWARD_STREAM_H
#define _CPP_BACKWARD_STREAM_H 1
+ #include "backward_warning.h"
#include "iostream.h"
#endif
Index: include/backward/streambuf.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/streambuf.h,v
retrieving revision 1.2
diff -c -p -r1.2 streambuf.h
*** streambuf.h 2000/11/21 23:44:50 1.2
--- streambuf.h 2001/04/05 22:56:47
***************
*** 28,33 ****
--- 28,34 ----
#ifndef _CPP_BACKWARD_STREAMBUF_H
#define _CPP_BACKWARD_STREAMBUF_H 1
+ #include "backward_warning.h"
#include <bits/std_streambuf.h>
using std::streambuf;
Index: include/backward/strstream
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/strstream,v
retrieving revision 1.2
diff -c -p -r1.2 strstream
*** strstream 2001/03/04 21:34:00 1.2
--- strstream 2001/04/05 22:56:47
***************
*** 19,28 ****
#ifndef __SGI_STL_STRSTREAM
#define __SGI_STL_STRSTREAM
! #if defined(__sgi) && !defined(__GNUC__) && !defined(_STANDARD_C_PLUS_PLUS)
! #error This header file requires the -LANG:std option
! #endif
!
#include <bits/std_iosfwd.h>
#include <bits/std_ios.h>
#include <bits/std_istream.h>
--- 19,25 ----
#ifndef __SGI_STL_STRSTREAM
#define __SGI_STL_STRSTREAM
! #include "backward_warning.h"
#include <bits/std_iosfwd.h>
#include <bits/std_ios.h>
#include <bits/std_istream.h>
Index: include/backward/tempbuf.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/tempbuf.h,v
retrieving revision 1.3
diff -c -p -r1.3 tempbuf.h
*** tempbuf.h 2001/03/31 20:15:42 1.3
--- tempbuf.h 2001/04/05 22:56:47
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_TEMPBUF_H
#define _CPP_BACKWARD_TEMPBUF_H 1
+ #include "backward_warning.h"
#include "pair.h"
#include "iterator.h"
#include <limits.h>
Index: include/backward/tree.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/tree.h,v
retrieving revision 1.3
diff -c -p -r1.3 tree.h
*** tree.h 2001/03/31 20:15:42 1.3
--- tree.h 2001/04/05 22:56:47
***************
*** 16,21 ****
--- 16,22 ----
#ifndef _CPP_EXT_TREE
#define _CPP_EXT_TREE 1
+ #include "backward_warning.h"
#include <bits/stl_tree.h>
using std::rb_tree;
Index: include/backward/vector.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/vector.h,v
retrieving revision 1.3
diff -c -p -r1.3 vector.h
*** vector.h 2001/03/12 19:58:04 1.3
--- vector.h 2001/04/05 22:56:48
***************
*** 27,32 ****
--- 27,33 ----
#ifndef _CPP_BACKWARD_VECTOR_H
#define _CPP_BACKWARD_VECTOR_H 1
+ #include "backward_warning.h"
#include "algobase.h"
#include "alloc.h"
#include <bits/std_vector.h>
Index: libio/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/libio/Makefile.in,v
retrieving revision 1.75
diff -c -p -r1.75 Makefile.in
*** Makefile.in 2001/04/03 00:26:57 1.75
--- Makefile.in 2001/04/05 22:56:49
*************** xcompiling = @xcompiling@
*** 111,117 ****
AUTOMAKE_OPTIONS = 1.3 cygnus
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
! @GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la
@GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES =
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
--- 111,117 ----
AUTOMAKE_OPTIONS = 1.3 cygnus
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
! @GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la
@GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES =
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
*************** LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES
*** 123,143 ****
LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
! INCLUDES = \
! -nostdinc++ \
! -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) \
! $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
! libio_headers = \
! libio.h libioP.h iolibio.h
! @GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = @GLIBCPP_NEED_LIBIO_TRUE@\
! @GLIBCPP_NEED_LIBIO_TRUE@ filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c \
! @GLIBCPP_NEED_LIBIO_TRUE@ iofclose.c iofopen.c
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS =
! @GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = @GLIBCPP_NEED_WLIBIO_TRUE@\
! @GLIBCPP_NEED_WLIBIO_TRUE@ wfiledoalloc.c wfileops.c wgenops.c iofwide.c
@GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS =
EXTRA_DIST = iostreamP.h
--- 123,136 ----
LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
! INCLUDES = -nostdinc++ -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
! libio_headers = libio.h libioP.h iolibio.h
! @GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c iofopen.c
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS =
! @GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c iofwide.c
@GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS =
EXTRA_DIST = iostreamP.h
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.81
diff -c -p -r1.81 Makefile.am
*** Makefile.am 2001/04/03 00:26:58 1.81
--- Makefile.am 2001/04/05 22:56:53
*************** backward_headers = \
*** 110,116 ****
backward/pair.h backward/queue.h backward/rope.h backward/set.h \
backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h \
backward/vector.h backward/fstream.h backward/strstream.h \
! backward/strstream
ext_headers = \
ext/rope ext/ropeimpl.h ext/stl_rope.h \
--- 110,116 ----
backward/pair.h backward/queue.h backward/rope.h backward/set.h \
backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h \
backward/vector.h backward/fstream.h backward/strstream.h \
! backward/strstream backward/backward_warning.h
ext_headers = \
ext/rope ext/ropeimpl.h ext/stl_rope.h \
*************** install-data-local: myinstalldirs myinst
*** 234,239 ****
--- 234,240 ----
# NB: installation of shadow header directories is not attempted.
myinstalldirs:
if test -z "$(MULTISUBDIR)"; then \
+ $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/backward; \
$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/bits; \
$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/ext; \
$(mkinstalldirs) $(DESTDIR)$(gxx_target_include_dir)/bits; \
*************** c_incdir = @C_INCLUDE_DIR@
*** 248,266 ****
myinstallheaders:
if test -z "$(MULTISUBDIR)"; then \
for i in $(base_headers); do \
! echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/"; \
$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/; \
done; \
for i in $(ext_headers); do \
! echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/"; \
$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/; \
done; \
for i in $(backward_headers); do \
! echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)"; \
! $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir); \
done; \
for i in $(c_base_headers); do \
! echo "$(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/"; \
$(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/; \
done; \
for i in $(std_headers); do \
--- 249,267 ----
myinstallheaders:
if test -z "$(MULTISUBDIR)"; then \
for i in $(base_headers); do \
! echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/";\
$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/; \
done; \
for i in $(ext_headers); do \
! echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/";\
$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/; \
done; \
for i in $(backward_headers); do \
! echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/backward/";\
! $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/backward/; \
done; \
for i in $(c_base_headers); do \
! echo "$(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/";\
$(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/; \
done; \
for i in $(std_headers); do \