diff options
author | qctecmdr <qctecmdr@localhost> | 2019-04-22 10:24:24 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-04-22 10:24:24 -0700 |
commit | 3d5fbdc4027820b65896abed9ea48bc7eafc18e1 (patch) | |
tree | 668699322a094066242bef8d33aeef2f153fdd95 /utils/LocIpc.h | |
parent | 1fb5c0caf5c8902f636d502dbb7d437fbc702e85 (diff) | |
parent | 07db01d9af3ac18a2be12bbf58904a6d6fb749f6 (diff) | |
download | gps-3d5fbdc4027820b65896abed9ea48bc7eafc18e1.tar.gz |
Merge "LocIpc derefs nullptr if stopping blocking listener"
Diffstat (limited to 'utils/LocIpc.h')
-rw-r--r-- | utils/LocIpc.h | 6 |
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 { |