diff options
| author | qctecmdr Service <qctecmdr@qualcomm.com> | 2019-03-12 18:52:28 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-03-12 18:52:28 -0700 |
| commit | 1b6ad38fb95b904d30ec870efcbc8f46e81b76ba (patch) | |
| tree | 6506e06a0ae098c27aabfe73cad2a47e618feaa2 /core | |
| parent | de7fa11dd6af5c03969a5f544a417913eebc2f79 (diff) | |
| parent | b082fd7f7b113eea91a6a8756bb3991dda7b0491 (diff) | |
| download | gps-1b6ad38fb95b904d30ec870efcbc8f46e81b76ba.tar.gz | |
Merge "allow a isMaster client in LocAdapterProxyBase ctor"
Diffstat (limited to 'core')
| -rw-r--r-- | core/LocAdapterBase.h | 10 | ||||
| -rw-r--r-- | core/LocAdapterProxyBase.h | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/core/LocAdapterBase.h b/core/LocAdapterBase.h index e4f7be2..97e0b4a 100644 --- a/core/LocAdapterBase.h +++ b/core/LocAdapterBase.h @@ -69,15 +69,11 @@ protected: inline LocAdapterBase(const MsgTask* msgTask) : mIsMaster(false), mEvtMask(0), mContext(NULL), mLocApi(NULL), mLocAdapterProxyBase(NULL), mMsgTask(msgTask) {} - LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask, - ContextBase* context, bool isMaster, - LocAdapterProxyBase *adapterProxyBase = NULL); public: inline virtual ~LocAdapterBase() { mLocApi->removeAdapter(this); } - inline LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask, - ContextBase* context, - LocAdapterProxyBase *adapterProxyBase = NULL) : - LocAdapterBase(mask, context, false, adapterProxyBase) {} + LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask, + ContextBase* context, bool isMaster = false, + LocAdapterProxyBase *adapterProxyBase = NULL); inline LOC_API_ADAPTER_EVENT_MASK_T checkMask(LOC_API_ADAPTER_EVENT_MASK_T mask) const { diff --git a/core/LocAdapterProxyBase.h b/core/LocAdapterProxyBase.h index b33d7b0..727d424 100644 --- a/core/LocAdapterProxyBase.h +++ b/core/LocAdapterProxyBase.h @@ -40,8 +40,8 @@ private: LocAdapterBase *mLocAdapterBase; protected: inline LocAdapterProxyBase(const LOC_API_ADAPTER_EVENT_MASK_T mask, - ContextBase* context): - mLocAdapterBase(new LocAdapterBase(mask, context, this)) { + ContextBase* context, bool isMaster = false): + mLocAdapterBase(new LocAdapterBase(mask, context, isMaster, this)) { } inline virtual ~LocAdapterProxyBase() { delete mLocAdapterBase; |