From c414242f1327d2583dd9af47d76fc74e68a61926 Mon Sep 17 00:00:00 2001 From: Thomas Geymayer Date: Sun, 3 Mar 2013 01:19:35 +0100 Subject: [PATCH] sg_netChat: let getTerminator return const char* for compatiblity with FlightGear --- simgear/io/sg_netChat.cxx | 4 ++-- simgear/io/sg_netChat.hxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/simgear/io/sg_netChat.cxx b/simgear/io/sg_netChat.cxx index 0559c09b..d445e443 100644 --- a/simgear/io/sg_netChat.cxx +++ b/simgear/io/sg_netChat.cxx @@ -37,10 +37,10 @@ NetChat::setTerminator(const std::string& t) bytesToCollect = -1; } -const std::string& +const char* NetChat::getTerminator() const { - return terminator; + return terminator.c_str(); } diff --git a/simgear/io/sg_netChat.hxx b/simgear/io/sg_netChat.hxx index bc6ef656..6b227f89 100644 --- a/simgear/io/sg_netChat.hxx +++ b/simgear/io/sg_netChat.hxx @@ -79,7 +79,7 @@ public: {} void setTerminator(const std::string& t); - const std::string& getTerminator() const; + const char* getTerminator() const; /** * set byte count to collect - 'foundTerminator' will be called once -- 2.39.5