From 99676ab2deb1bc5a024728b39a7700bb0f854dad Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Fri, 19 May 2017 22:53:35 +0900 Subject: [PATCH] Rename a private struct ServiceBase::ClientInfo to __ClientInfo Change-Id: If49557efacb439d5d33f284ec19a754a1c010d68 Signed-off-by: Mu-Woong Lee --- include/ServiceBase.h | 4 ++-- src/server/ServiceBase.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ServiceBase.h b/include/ServiceBase.h index b9532ff..2767aa1 100644 --- a/include/ServiceBase.h +++ b/include/ServiceBase.h @@ -109,12 +109,12 @@ namespace ctx { GDBusNodeInfo* __nodeInfo; guint __registrationId; - struct ClientInfo { + struct __ClientInfo { ClientBase* client; unsigned int watchId; }; - std::map __clients; + std::map __clients; }; } diff --git a/src/server/ServiceBase.cpp b/src/server/ServiceBase.cpp index 2a8585d..62926e9 100644 --- a/src/server/ServiceBase.cpp +++ b/src/server/ServiceBase.cpp @@ -283,7 +283,7 @@ ClientBase* ServiceBase::__getClient(const std::string& busName) return NULL; } - ClientInfo info = {client, __watch(busName, client)}; + __ClientInfo info = {client, __watch(busName, client)}; __clients[busName] = info; return client; @@ -304,7 +304,7 @@ void ServiceBase::__removeClient(const std::string& busName) auto iter = __clients.find(busName); IF_FAIL_VOID(iter != __clients.end()); - ClientInfo info = iter->second; + __ClientInfo info = iter->second; __clients.erase(iter); __unwatch(info.watchId); -- 2.7.4