// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Library General Public License for more details.
//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
#ifndef _SGSTREAM_HXX
#define _SGSTREAM_HXX
-#ifndef __cplusplus
+#ifndef __cplusplus
# error This library requires C++
-#endif
+#endif
#include <simgear/compiler.h>
-#if defined( SG_HAVE_STD_INCLUDES )
# include <istream>
-#elif defined ( __BORLANDC__ )
-# include <iostream>
-#else
-# include <istream.h>
-#endif
-#include STL_STRING
+#include <string>
#include <simgear/misc/zfstream.hxx>
-SG_USING_STD(string);
-SG_USING_STD(istream);
-
-
/**
* An envelope class for gzifstream.
*/
-class sg_gzifstream : private gzifstream_base, public istream
+class sg_gzifstream : private gzifstream_base, public std::istream
{
public:
/** Default constructor */
* @param name name of file
* @param io_mode file open mode(s) "or'd" together
*/
- sg_gzifstream( const string& name,
+ sg_gzifstream( const std::string& name,
ios_openmode io_mode = ios_in | ios_binary );
/**
* @param name name of file
* @param io_mode file open mode(s) "or'd" together
*/
- void open( const string& name,
+ void open( const std::string& name,
ios_openmode io_mode = ios_in|ios_binary );
/**
* An istream manipulator that skips to end of line.
* @param in input stream
*/
-istream& skipeol( istream& in );
+std::istream& skipeol( std::istream& in );
/**
* \relates sg_gzifstream
* An istream manipulator that skips over white space.
* @param in input stream
*/
-istream& skipws( istream& in );
+std::istream& skipws( std::istream& in );
/**
* \relates sg_gzifstream
* Ignores comments that start with '#'.
* @param in input stream
*/
-istream& skipcomment( istream& in );
+std::istream& skipcomment( std::istream& in );
#endif /* _SGSTREAM_HXX */