summaryrefslogtreecommitdiff
path: root/utils/LocIpc.h
diff options
context:
space:
mode:
authorqctecmdr <qctecmdr@localhost>2019-04-22 10:24:24 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-04-22 10:24:24 -0700
commit3d5fbdc4027820b65896abed9ea48bc7eafc18e1 (patch)
tree668699322a094066242bef8d33aeef2f153fdd95 /utils/LocIpc.h
parent1fb5c0caf5c8902f636d502dbb7d437fbc702e85 (diff)
parent07db01d9af3ac18a2be12bbf58904a6d6fb749f6 (diff)
downloadgps-3d5fbdc4027820b65896abed9ea48bc7eafc18e1.tar.gz
Merge "LocIpc derefs nullptr if stopping blocking listener"
Diffstat (limited to 'utils/LocIpc.h')
-rw-r--r--utils/LocIpc.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/LocIpc.h b/utils/LocIpc.h
index 90f9e1b..707df21 100644
--- a/utils/LocIpc.h
+++ b/utils/LocIpc.h
@@ -37,6 +37,8 @@
#include <sys/un.h>
#include <LocThread.h>
+using std::string;
+
namespace loc_util {
class LocIpcSender;
@@ -44,7 +46,7 @@ class LocIpcSender;
class LocIpc {
friend LocIpcSender;
public:
- inline LocIpc() : mIpcFd(-1), mRunnable(nullptr) {}
+ inline LocIpc() : mIpcFd(-1) {}
inline virtual ~LocIpc() { stopListening(); }
// Listen for new messages in current thread. Calling this funciton will
@@ -94,7 +96,7 @@ private:
int mIpcFd;
LocThread mThread;
- LocRunnable *mRunnable;
+ string mIpcName;
};
class LocIpcSender {