Patch to tweak traits so they work on Irix too.
This commit is contained in:
@@ -238,6 +238,7 @@
|
|||||||
# define FG_NAMESPACES
|
# define FG_NAMESPACES
|
||||||
# define FG_HAVE_STD
|
# define FG_HAVE_STD
|
||||||
# define FG_CLASS_PARTIAL_SPECIALIZATION
|
# define FG_CLASS_PARTIAL_SPECIALIZATION
|
||||||
|
# define FG_HAVE_TRAITS
|
||||||
|
|
||||||
# define STL_ALGORITHM <algorithm>
|
# define STL_ALGORITHM <algorithm>
|
||||||
# define STL_FUNCTIONAL <functional>
|
# define STL_FUNCTIONAL <functional>
|
||||||
|
|||||||
@@ -31,6 +31,11 @@
|
|||||||
|
|
||||||
#include <simgear/compiler.h>
|
#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
|
#ifdef FG_HAVE_STD_INCLUDES
|
||||||
# include <streambuf>
|
# include <streambuf>
|
||||||
# include <iostream>
|
# include <iostream>
|
||||||
@@ -46,6 +51,8 @@ FG_USING_STD(streambuf);
|
|||||||
FG_USING_STD(ostream);
|
FG_USING_STD(ostream);
|
||||||
FG_USING_STD(cerr);
|
FG_USING_STD(cerr);
|
||||||
FG_USING_STD(endl);
|
FG_USING_STD(endl);
|
||||||
|
#else
|
||||||
|
FG_USING_STD(char_traits);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __MWERKS__
|
#ifdef __MWERKS__
|
||||||
@@ -73,8 +80,8 @@ public:
|
|||||||
#ifndef FG_HAVE_STD_INCLUDES
|
#ifndef FG_HAVE_STD_INCLUDES
|
||||||
typedef char_traits<char> traits_type;
|
typedef char_traits<char> traits_type;
|
||||||
typedef char_traits<char>::int_type int_type;
|
typedef char_traits<char>::int_type int_type;
|
||||||
typedef char_traits<char>::pos_type pos_type;
|
// typedef char_traits<char>::pos_type pos_type;
|
||||||
typedef char_traits<char>::off_type off_type;
|
// typedef char_traits<char>::off_type off_type;
|
||||||
#endif
|
#endif
|
||||||
// logbuf( streambuf* sb ) : sbuf(sb) {}
|
// logbuf( streambuf* sb ) : sbuf(sb) {}
|
||||||
logbuf();
|
logbuf();
|
||||||
|
|||||||
@@ -101,8 +101,8 @@ public:
|
|||||||
#ifndef FG_HAVE_STD_INCLUDES
|
#ifndef FG_HAVE_STD_INCLUDES
|
||||||
typedef char_traits<char> traits_type;
|
typedef char_traits<char> traits_type;
|
||||||
typedef char_traits<char>::int_type int_type;
|
typedef char_traits<char>::int_type int_type;
|
||||||
typedef char_traits<char>::pos_type pos_type;
|
// typedef char_traits<char>::pos_type pos_type;
|
||||||
typedef char_traits<char>::off_type off_type;
|
// typedef char_traits<char>::off_type off_type;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gzfilebuf();
|
gzfilebuf();
|
||||||
|
|||||||
Reference in New Issue
Block a user