diff --git a/include/asynchronousContinuation.h b/include/asynchronousContinuation.h index c93e9d2..fd563bf 100644 --- a/include/asynchronousContinuation.h +++ b/include/asynchronousContinuation.h @@ -106,7 +106,7 @@ public: template class SerializedAsynchronousContinuation -: public PostedAsynchronousContinuation, public LockSpec +: public PostedAsynchronousContinuation, public LockSet { public: SerializedAsynchronousContinuation( @@ -114,13 +114,13 @@ public: OriginalCbFnT originalCbFn, std::vector> requiredLocks = {}) : PostedAsynchronousContinuation(caller, originalCbFn), - LockSpec(std::move(requiredLocks)) + LockSet(std::move(requiredLocks)) {} template void callOriginalCb(Args&&... args) { - LockSpec::release(); + LockSet::release(); PostedAsynchronousContinuation::callOriginalCb( std::forward(args)...); } diff --git a/include/lockSpec.h b/include/lockSpec.h index cfd5957..07af852 100644 --- a/include/lockSpec.h +++ b/include/lockSpec.h @@ -10,16 +10,16 @@ namespace smo { /** - * @brief LockSpec - Manages a collection of locks for acquisition/release + * @brief LockSet - Manages a collection of locks for acquisition/release */ -class LockSpec +class LockSet { public: /** * @brief Constructor * @param requiredLocks Vector of lock references that must be acquired */ - LockSpec(std::vector> requiredLocks = {}) + LockSet(std::vector> requiredLocks = {}) : requiredLocks(std::move(requiredLocks)), allLocksAcquired(false) {} @@ -33,7 +33,7 @@ public: { throw std::runtime_error( std::string(__func__) + - ": LockSpec::tryAcquire() called but allLocksAcquired is " + ": LockSet::tryAcquire() called but allLocksAcquired is " "already true"); } @@ -68,7 +68,7 @@ public: { throw std::runtime_error( std::string(__func__) + - ": LockSpec::release() called but allLocksAcquired is false"); + ": LockSet::release() called but allLocksAcquired is false"); } for (auto& lockRef : requiredLocks) { diff --git a/include/lockvoker.h b/include/lockvoker.h index c637e90..e253701 100644 --- a/include/lockvoker.h +++ b/include/lockvoker.h @@ -23,7 +23,7 @@ public: /** * @brief Constructor that immediately posts to io_service * @param serializedContinuation Reference to the serialized continuation - * containing LockSpec and target io_service + * containing LockSet and target io_service * @param invocationTarget The std::bind result to invoke when locks are acquired */ LockerAndInvoker(