[v3] fixups for strstream, strstream.h
Benjamin Kosnik
bkoz@redhat.com
Wed Nov 22 19:24:00 GMT 2000
As threatened, this patch adds consistent behavior with the deprecated
strstream and strstream.h headers and other compatibility headers such
as new and new.h. (It also adopts the macro guard style currently in
use for backwards headers for new.h)
2000-11-22 Benjamin Kosnik <bkoz@redhat.com>
Make deprecated strstream header consistent with new and new.h.
* include/backward/strstream.h: Add. Use using declarations to
scope strstreambuf, istrstream, ostrstream, strstream to global
scope.
* include/backward/strstream: Remove using declarations.
* src/Makefile.am (base_headers): Add strstream.
* src/Makefile.in: Regenerate.
* include/backward/new.h (_CPP_BACKWARD_NEW_H): Change macro guard
to be consistent with other headers.
Index: include/backward/strstream.h
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/include/backward/strstream.h,v
retrieving revision 1.3
diff -c -p -r1.3 strstream.h
*** strstream.h 2000/11/22 18:06:53 1.3
--- strstream.h 2000/11/23 03:22:12
***************
*** 1,166 ****
! /*
! * Copyright (c) 1998
! * Silicon Graphics Computer Systems, Inc.
! *
! * Permission to use, copy, modify, distribute and sell this software
! * and its documentation for any purpose is hereby granted without fee,
! * provided that the above copyright notice appear in all copies and
! * that both that copyright notice and this permission notice appear
! * in supporting documentation. Silicon Graphics makes no
! * representations about the suitability of this software for any
! * purpose. It is provided "as is" without express or implied warranty.
! */
!
! // WARNING: The classes defined in this header are DEPRECATED. This
! // header is defined in section D.7.1 of the C++ standard, and it
! // MAY BE REMOVED in a future standard revision. You should use the
! // header <sstream> instead.
!
! #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>
! #include <bits/std_ostream.h>
! #include <bits/std_string.h>
!
! __STL_BEGIN_NAMESPACE
!
! //----------------------------------------------------------------------
! // Class strstreambuf, a streambuf class that manages an array of char.
! // Note that this class is not a template.
!
! class strstreambuf : public basic_streambuf<char, char_traits<char> >
! {
! public: // Types.
! typedef char_traits<char> _Traits;
! typedef basic_streambuf<char, _Traits> _Base;
!
! public: // Constructor, destructor
! explicit strstreambuf(streamsize __initial_capacity = 0);
! strstreambuf(void* (*__alloc)(size_t), void (*__free)(void*));
!
! strstreambuf(char* __get, streamsize __n, char* __put = 0);
! strstreambuf(signed char* __get, streamsize __n, signed char* __put = 0);
! strstreambuf(unsigned char* __get, streamsize __n, unsigned char* __put=0);
!
! strstreambuf(const char* __get, streamsize __n);
! strstreambuf(const signed char* __get, streamsize __n);
! strstreambuf(const unsigned char* __get, streamsize __n);
!
! virtual ~strstreambuf();
!
! public: // strstreambuf operations.
! void freeze(bool = true);
! char* str();
! int pcount() const;
!
! protected: // Overridden virtual member functions.
! virtual int_type overflow(int_type __c = _Traits::eof());
! virtual int_type pbackfail(int_type __c = _Traits::eof());
! virtual int_type underflow();
! virtual _Base* setbuf(char* __buf, streamsize __n);
! virtual pos_type seekoff(off_type __off, ios_base::seekdir __dir,
! ios_base::openmode __mode
! = ios_base::in | ios_base::out);
! virtual pos_type seekpos(pos_type __pos, ios_base::openmode __mode
! = ios_base::in | ios_base::out);
!
! private: // Helper functions.
! // Dynamic allocation, possibly using _M_alloc_fun and _M_free_fun.
! char* _M_alloc(size_t);
! void _M_free(char*);
!
! // Helper function used in constructors.
! void _M_setup(char* __get, char* __put, streamsize __n);
!
! private: // Data members.
! void* (*_M_alloc_fun)(size_t);
! void (*_M_free_fun)(void*);
!
! bool _M_dynamic : 1;
! bool _M_frozen : 1;
! bool _M_constant : 1;
! };
!
! //----------------------------------------------------------------------
! // Class istrstream, an istream that manages a strstreambuf.
!
! class istrstream : public basic_istream<char>
! {
! public:
! explicit istrstream(char*);
! explicit istrstream(const char*);
! istrstream(char* , streamsize);
! istrstream(const char*, streamsize);
! virtual ~istrstream();
!
! strstreambuf* rdbuf() const;
! char* str();
!
! private:
! strstreambuf _M_buf;
! };
!
! //----------------------------------------------------------------------
! // Class ostrstream
!
! class ostrstream : public basic_ostream<char>
! {
! public:
! ostrstream();
! ostrstream(char*, int, ios_base::openmode = ios_base::out);
! virtual ~ostrstream();
!
! strstreambuf* rdbuf() const;
! void freeze(bool = true);
! char* str();
! int pcount() const;
!
! private:
! strstreambuf _M_buf;
! };
!
! //----------------------------------------------------------------------
! // Class strstream
!
! class strstream : public basic_iostream<char>
! {
! public:
! typedef char char_type;
! typedef char_traits<char>::int_type int_type;
! typedef char_traits<char>::pos_type pos_type;
! typedef char_traits<char>::off_type off_type;
!
! strstream();
! strstream(char*, int, ios_base::openmode = ios_base::in | ios_base::out);
! virtual ~strstream();
!
! strstreambuf* rdbuf() const;
! void freeze(bool = true);
! int pcount() const;
! char* str();
!
! private:
! strstreambuf _M_buf;
! };
! __STL_END_NAMESPACE
using std::strstreambuf;
using std::istrstream;
using std::ostrstream;
using std::strstream;
-
- #endif /* __SGI_STL_STRSTREAM */
-
- // Local Variables:
- // mode:C++
- // End:
--- 1,41 ----
! // -*- C++ -*- forwarding header.
! // Copyright (C) 2000 Free Software Foundation
! // This file is part of GNU CC.
! //
! // GNU CC is free software; you can redistribute it and/or modify
! // it under the terms of the GNU General Public License as published by
! // the Free Software Foundation; either version 2, or (at your option)
! // any later version.
! //
! // GNU CC is distributed in the hope that it will be useful,
! // but WITHOUT ANY WARRANTY; without even the implied warranty of
! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! // GNU General Public License for more details.
! //
! // You should have received a copy of the GNU General Public License
! // along with GNU CC; see the file COPYING. If not, write to
! // the Free Software Foundation, 59 Temple Place - Suite 330,
! // Boston, MA 02111-1307, USA.
!
! // As a special exception, you may use this file as part of a free software
! // library without restriction. Specifically, if other files instantiate
! // templates or use macros or inline functions from this file, or you compile
! // this file and link it with other files to produce an executable, this
! // file does not by itself cause the resulting executable to be covered by
! // the GNU General Public License. This exception does not however
! // invalidate any other reasons why the executable file might be covered by
! // the GNU General Public License.
+ #ifndef _CPP_BACKWARD_STRSTREAM_H
+ #define _CPP_BACKWARD_STRSTREAM_H 1
+
+ #include <strstream>
+
using std::strstreambuf;
using std::istrstream;
using std::ostrstream;
using std::strstream;
+ #endif
Index: include/backward/new.h
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/include/backward/new.h,v
retrieving revision 1.2
diff -c -p -r1.2 new.h
*** new.h 2000/11/21 23:44:50 1.2
--- new.h 2000/11/23 03:22:58
***************
*** 27,34 ****
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
! #ifndef __NEW_H__
! #define __NEW_H__
#include <new>
--- 27,34 ----
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
! #ifndef _CPP_BACKWARD_NEW_H
! #define _CPP_BACKWARD_NEW_H 1
#include <new>
*************** using std::nothrow;
*** 38,41 ****
using std::new_handler;
using std::set_new_handler;
! #endif // __NEW_H__
--- 38,41 ----
using std::new_handler;
using std::set_new_handler;
! #endif
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.50
diff -c -p -r1.50 Makefile.am
*** Makefile.am 2000/11/22 17:55:06 1.50
--- Makefile.am 2000/11/23 03:23:15
*************** base_headers = \
*** 103,109 ****
backward/multiset.h backward/pair.h backward/iostream.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 \
bits/std_bitset.h bits/std_deque.h bits/std_functional.h \
bits/std_iterator.h bits/std_list.h \
bits/std_map.h bits/std_memory.h bits/std_numeric.h \
--- 103,109 ----
backward/multiset.h backward/pair.h backward/iostream.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 \
bits/std_bitset.h bits/std_deque.h bits/std_functional.h \
bits/std_iterator.h bits/std_list.h \
bits/std_map.h bits/std_memory.h bits/std_numeric.h \
More information about the Gcc-patches
mailing list