FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch to tweak traits so they work on Irix too.

Browse Source
This commit is contained in:
curt 2001-03-06 21:14:32 +00:00
parent f1ab6e2533
commit a86868526e
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
simgear/compiler.h
View File

@ -238,6 +238,7 @@
# define FG_NAMESPACES
# define FG_HAVE_STD
# define FG_CLASS_PARTIAL_SPECIALIZATION
# define FG_HAVE_TRAITS
# define STL_ALGORITHM <algorithm>
# define STL_FUNCTIONAL <functional>

11
simgear/debug/logstream.hxx
View File

@ -31,6 +31,11 @@
#include <simgear/compiler.h>
// At least Irix needs this
#ifdef FG_HAVE_NATIVE_SGI_COMPILERS
#include <char_traits.h>
#endif
#ifdef FG_HAVE_STD_INCLUDES
# include <streambuf>
# include <iostream>
@ -46,6 +51,8 @@ FG_USING_STD(streambuf);
FG_USING_STD(ostream);
FG_USING_STD(cerr);
FG_USING_STD(endl);
#else
FG_USING_STD(char_traits);
#endif
#ifdef __MWERKS__
@ -73,8 +80,8 @@ public:
#ifndef FG_HAVE_STD_INCLUDES
typedef char_traits<char> traits_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;
// typedef char_traits<char>::pos_type pos_type;
// typedef char_traits<char>::off_type off_type;
#endif
// logbuf( streambuf* sb ) : sbuf(sb) {}
logbuf();

4
simgear/misc/zfstream.hxx
View File

@ -101,8 +101,8 @@ public:
#ifndef FG_HAVE_STD_INCLUDES
typedef char_traits<char> traits_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;
// typedef char_traits<char>::pos_type pos_type;
// typedef char_traits<char>::off_type off_type;
#endif
gzfilebuf();