Merge commit 'refs/merge-requests/1579' of git://gitorious.org/fg/flightgear into...

[flightgear.git] / src / Autopilot / functor.hxx

diff --git a/src/Autopilot/functor.hxx b/src/Autopilot/functor.hxx
index 2f1ac36dfa2f18d8276248cc8f26fca09a184ba3..7d4f247cb7a4fa7fe414e04423fb9d9b17887cc1 100644 (file)
--- a/src/Autopilot/functor.hxx
+++ b/src/Autopilot/functor.hxx
@@ -31,15 +31,19 @@ namespace FGXMLAutopilot {
 
 template <class TBase> class FunctorBase {
 public:
-  virtual TBase * operator()( SGPropertyNode_ptr configNode ) = 0;
+  virtual ~FunctorBase() {}
+  virtual TBase * operator()( SGPropertyNode& prop_root,
+                              SGPropertyNode& cfg ) = 0;
 };
 
 template <class TClass,class TBase> class CreateAndConfigureFunctor : 
   public FunctorBase<TBase> {
 public:
-  virtual TBase * operator()( SGPropertyNode_ptr configNode ) { 
+  virtual TBase * operator()( SGPropertyNode& prop_root,
+                              SGPropertyNode& cfg )
+  {
     TBase * base = new TClass();
-    base->configure( configNode );
+    base->configure(prop_root, cfg);
     return base;
   }
 };