From ef330edbe4c208427346549684c77b80078ea3c9 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 22 Jun 2021 13:52:38 +0200
Subject: [PATCH] Make casing consistent
---
.../armem/client/util/MemoryListener.cpp | 2 +-
.../armem/client/util/MemoryListener.h | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp b/source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp
index 318d1294e..996129960 100644
--- a/source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp
+++ b/source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp
@@ -64,7 +64,7 @@ namespace armarx::armem::client::util
}
- void MemoryListener::subscribe(const MemoryID& subscriptionID, callback_updated_only callback)
+ void MemoryListener::subscribe(const MemoryID& subscriptionID, CallbackUpdatedOnly callback)
{
subscribe(subscriptionID, [callback](const MemoryID&, const std::vector<MemoryID>& updatedSnapshotIDs)
{
diff --git a/source/RobotAPI/libraries/armem/client/util/MemoryListener.h b/source/RobotAPI/libraries/armem/client/util/MemoryListener.h
index e412bfefc..7591f1f5d 100644
--- a/source/RobotAPI/libraries/armem/client/util/MemoryListener.h
+++ b/source/RobotAPI/libraries/armem/client/util/MemoryListener.h
@@ -21,13 +21,13 @@ namespace armarx::armem::client::util
class MemoryListener
{
- using callback = std::function<void(const MemoryID& subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs)>;
- using callback_updated_only = std::function<void(const std::vector<MemoryID>& updatedSnapshotIDs)>;
+ using Callback = std::function<void(const MemoryID& subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs)>;
+ using CallbackUpdatedOnly = std::function<void(const std::vector<MemoryID>& updatedSnapshotIDs)>;
template <class CalleeT>
- using member_callback = void(CalleeT::*)(const MemoryID& subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs);
+ using MemberCallback = void(CalleeT::*)(const MemoryID& subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs);
template <class CalleeT>
- using member_callback_updated_only = void(CalleeT::*)(const std::vector<MemoryID>& updatedSnapshotIDs);
+ using MemberCallbackUpdatedOnly = void(CalleeT::*)(const std::vector<MemoryID>& updatedSnapshotIDs);
public:
@@ -35,8 +35,8 @@ namespace armarx::armem::client::util
MemoryListener();
- void subscribe(const MemoryID& subscriptionID, callback callback);
- void subscribe(const MemoryID& subscriptionID, callback_updated_only callback);
+ void subscribe(const MemoryID& subscriptionID, Callback Callback);
+ void subscribe(const MemoryID& subscriptionID, CallbackUpdatedOnly Callback);
/**
* Subscribe with a class member function:
@@ -45,7 +45,7 @@ namespace armarx::armem::client::util
* @endcode
*/
template <class CalleeT>
- void subscribe(const MemoryID& subscriptionID, CalleeT* callee, member_callback<CalleeT> callback)
+ void subscribe(const MemoryID& subscriptionID, CalleeT* callee, MemberCallback<CalleeT> callback)
{
auto cb = [callee, callback](const MemoryID & subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs)
{
@@ -54,7 +54,7 @@ namespace armarx::armem::client::util
subscribe(subscriptionID, cb);
}
template <class CalleeT>
- void subscribe(const MemoryID& subscriptionID, CalleeT* callee, member_callback_updated_only<CalleeT> callback)
+ void subscribe(const MemoryID& subscriptionID, CalleeT* callee, MemberCallbackUpdatedOnly<CalleeT> callback)
{
auto cb = [callee, callback](const MemoryID&, const std::vector<MemoryID>& updatedSnapshotIDs)
{
@@ -70,7 +70,7 @@ namespace armarx::armem::client::util
protected:
- std::unordered_map<MemoryID, std::vector<callback>> callbacks;
+ std::unordered_map<MemoryID, std::vector<Callback>> callbacks;
};
--
GitLab