From ca3bd1c309b87907f156b9d0a46beb6f58bbad80 Mon Sep 17 00:00:00 2001 From: timoore Date: Wed, 15 Jul 2009 23:16:05 +0000 Subject: [PATCH] accomodate changed getDisplayName interface in yasim::Hitch --- src/FDM/YASim/Hitch.cpp | 4 ++-- src/FDM/YASim/Hitch.hpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/FDM/YASim/Hitch.cpp b/src/FDM/YASim/Hitch.cpp index de39c4382..df8b1f7cc 100755 --- a/src/FDM/YASim/Hitch.cpp +++ b/src/FDM/YASim/Hitch.cpp @@ -224,12 +224,12 @@ void Hitch::setForceIsCalculatedByOther(bool b) _forceIsCalculatedByMaster=b; } -const char *Hitch::getConnectedPropertyNode() const +std::string Hitch::getConnectedPropertyNode() const { if (_towEndNode) return _towEndNode->getDisplayName(); else - return 0; + return std::string(""); } void Hitch::setConnectedPropertyNode(const char *nodename) diff --git a/src/FDM/YASim/Hitch.hpp b/src/FDM/YASim/Hitch.hpp index d97fa9ae9..45e9e7b84 100755 --- a/src/FDM/YASim/Hitch.hpp +++ b/src/FDM/YASim/Hitch.hpp @@ -1,6 +1,8 @@ #ifndef _HITCH_HPP #define _HITCH_HPP +#include + #include
namespace yasim { @@ -48,7 +50,7 @@ public: void integrate (float dt); - const char *getConnectedPropertyNode() const; + std::string getConnectedPropertyNode() const; void setConnectedPropertyNode(const char *nodename); private: