Fixes for compiling with native Irix compilers.
This commit is contained in:
parent
04170bd489
commit
b07612ce2f
4 changed files with 11 additions and 1 deletions
|
@ -39,7 +39,10 @@
|
|||
#endif
|
||||
|
||||
FG_USING_STD(string);
|
||||
|
||||
#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
|
||||
FG_USING_STD(ostream);
|
||||
#endif
|
||||
|
||||
#include <Include/fg_constants.h>
|
||||
|
||||
|
|
|
@ -36,6 +36,8 @@
|
|||
#include <Include/compiler.h>
|
||||
#ifdef FG_HAVE_STD_INCLUDES
|
||||
# include <istream>
|
||||
#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
|
||||
# include <iostream.h>
|
||||
#else
|
||||
# include <istream.h>
|
||||
#endif
|
||||
|
@ -45,7 +47,10 @@
|
|||
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(set);
|
||||
|
||||
#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
|
||||
FG_USING_STD(istream);
|
||||
#endif
|
||||
|
||||
|
||||
class fgAIRPORT {
|
||||
|
|
|
@ -81,6 +81,8 @@
|
|||
*/
|
||||
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#include <Time/timestamp.hxx>
|
||||
|
||||
#ifndef __cplusplus
|
||||
|
|
|
@ -88,7 +88,7 @@ int fgTileMgrInit( void ) {
|
|||
|
||||
|
||||
// load a tile
|
||||
void fgTileMgrLoadTile( const FGBucket& p, int *index) {
|
||||
void fgTileMgrLoadTile( FGBucket& p, int *index) {
|
||||
fgTILECACHE *c;
|
||||
|
||||
c = &global_tile_cache;
|
||||
|
|
Loading…
Reference in a new issue