Fix a problem where the compiler would mix up two function declarations because the...

diff --git a/simgear/structure/event_mgr.cxx b/simgear/structure/event_mgr.cxx
index 979420d71c7f4ee9b1c39bab06b167adbbf58b30..9ffb184be4d1576bac9b690e9a60ba1c6b3e10ec 100644 (file)
--- a/simgear/structure/event_mgr.cxx
+++ b/simgear/structure/event_mgr.cxx
@@ -71,12 +71,12 @@ SGEvent::SGEvent( const char* name,
 }
 
 SGEvent::SGEvent( const char* name,
-                  const SGSubsystem* subsystem,
+                  SGSubsystem* subsystem,
                   interval_type repeat_value,
                   interval_type initial_value )
     : _name(name),
       _callback(NULL),
-      _subsystem((SGSubsystem*)&subsystem),
+      _subsystem(subsystem),
       _repeat_value(repeat_value),
       _initial_value(initial_value),
       _cum_time(0),

diff --git a/simgear/structure/event_mgr.hxx b/simgear/structure/event_mgr.hxx
index bcfd2d2500b1a32242771ee9b28f4348f0ba2589..73cac934ddd7e96f6534f2e59b13424363185d37 100644 (file)
--- a/simgear/structure/event_mgr.hxx
+++ b/simgear/structure/event_mgr.hxx
@@ -71,7 +71,7 @@ public:
              interval_type initial_value );
 
     SGEvent( const char* desc,
-             const SGSubsystem* subsystem,
+             SGSubsystem* subsystem,
              interval_type repeat_value,
              interval_type initial_value );
 
@@ -176,7 +176,7 @@ public:
      * -1 means run immediately.
      */
     inline void add( const char* name,
-                     const SGSubsystem* subsystem,
+                     SGSubsystem* subsystem,
                      interval_type repeat_value,
                      interval_type initial_value = -1 )
     {