From f4b30bbdd7e59b0444eba5ad28c64c19659e4c3c Mon Sep 17 00:00:00 2001 From: ehofman Date: Thu, 27 Nov 2003 10:22:29 +0000 Subject: [PATCH] Portability fix --- simgear/compatibility/iomanip | 2 ++ simgear/nasal/nasal.h | 2 ++ simgear/structure/event_mgr.hxx | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/simgear/compatibility/iomanip b/simgear/compatibility/iomanip index f693dd4e..97d4ff1e 100644 --- a/simgear/compatibility/iomanip +++ b/simgear/compatibility/iomanip @@ -5,7 +5,9 @@ # include namespace std { + using ::setw; + using ::setprecision; inline int setfill(int f) { ::setfill(f); } }; diff --git a/simgear/nasal/nasal.h b/simgear/nasal/nasal.h index 417ca67d..0d5ff828 100644 --- a/simgear/nasal/nasal.h +++ b/simgear/nasal/nasal.h @@ -4,6 +4,8 @@ extern "C" { #endif +#define NASAL_BIG_ENDIAN_32_BIT + // This is a nasal "reference". They are always copied by value, and // contain either a pointer to a garbage-collectable nasal object // (string, vector, hash) or a floating point number. Keeping the diff --git a/simgear/structure/event_mgr.hxx b/simgear/structure/event_mgr.hxx index 1ae86d13..07c65d5f 100644 --- a/simgear/structure/event_mgr.hxx +++ b/simgear/structure/event_mgr.hxx @@ -107,7 +107,7 @@ public: { add(make_callback(o,m), 0, delay, false, sim); } private: - friend class SGTimer; + friend struct SGTimer; void add(SGCallback* cb, double interval, double delay, -- 2.39.5