From 31ae7c942c5e5dd8a04931e7fda0a2f34e9b7923 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Mon, 19 Dec 2016 11:24:23 -0800 Subject: [PATCH] Fixed signatures of deleted assignment operators (#408) While it technically doesn't matter what the return type of the assignment operator is since it's deleted, assignment operators should return a reference instead of a value. --- hal/include/HAL/handles/DigitalHandleResource.h | 5 +++-- hal/include/HAL/handles/IndexedClassedHandleResource.h | 7 ++++--- hal/include/HAL/handles/IndexedHandleResource.h | 5 +++-- hal/include/HAL/handles/LimitedClassedHandleResource.h | 7 ++++--- hal/include/HAL/handles/LimitedHandleResource.h | 5 +++-- hal/include/HAL/handles/UnlimitedHandleResource.h | 5 +++-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/hal/include/HAL/handles/DigitalHandleResource.h b/hal/include/HAL/handles/DigitalHandleResource.h index 553db2d641..20ff67daf3 100644 --- a/hal/include/HAL/handles/DigitalHandleResource.h +++ b/hal/include/HAL/handles/DigitalHandleResource.h @@ -37,9 +37,10 @@ class DigitalHandleResource { friend class DigitalHandleResourceTest; public: - DigitalHandleResource(const DigitalHandleResource&) = delete; - DigitalHandleResource operator=(const DigitalHandleResource&) = delete; DigitalHandleResource() = default; + DigitalHandleResource(const DigitalHandleResource&) = delete; + DigitalHandleResource& operator=(const DigitalHandleResource&) = delete; + THandle Allocate(int16_t index, HAL_HandleEnum enumValue, int32_t* status); std::shared_ptr Get(THandle handle, HAL_HandleEnum enumValue); void Free(THandle handle, HAL_HandleEnum enumValue); diff --git a/hal/include/HAL/handles/IndexedClassedHandleResource.h b/hal/include/HAL/handles/IndexedClassedHandleResource.h index f992c55d8e..e490a1fc24 100644 --- a/hal/include/HAL/handles/IndexedClassedHandleResource.h +++ b/hal/include/HAL/handles/IndexedClassedHandleResource.h @@ -39,10 +39,11 @@ class IndexedClassedHandleResource { friend class IndexedClassedHandleResourceTest; public: - IndexedClassedHandleResource(const IndexedClassedHandleResource&) = delete; - IndexedClassedHandleResource operator=(const IndexedClassedHandleResource&) = - delete; IndexedClassedHandleResource(); + IndexedClassedHandleResource(const IndexedClassedHandleResource&) = delete; + IndexedClassedHandleResource& operator=(const IndexedClassedHandleResource&) = + delete; + THandle Allocate(int16_t index, std::shared_ptr toSet, int32_t* status); std::shared_ptr Get(THandle handle); diff --git a/hal/include/HAL/handles/IndexedHandleResource.h b/hal/include/HAL/handles/IndexedHandleResource.h index ac321e4b67..91b4c42cba 100644 --- a/hal/include/HAL/handles/IndexedHandleResource.h +++ b/hal/include/HAL/handles/IndexedHandleResource.h @@ -38,9 +38,10 @@ class IndexedHandleResource { friend class IndexedHandleResourceTest; public: - IndexedHandleResource(const IndexedHandleResource&) = delete; - IndexedHandleResource operator=(const IndexedHandleResource&) = delete; IndexedHandleResource() = default; + IndexedHandleResource(const IndexedHandleResource&) = delete; + IndexedHandleResource& operator=(const IndexedHandleResource&) = delete; + THandle Allocate(int16_t index, int32_t* status); std::shared_ptr Get(THandle handle); void Free(THandle handle); diff --git a/hal/include/HAL/handles/LimitedClassedHandleResource.h b/hal/include/HAL/handles/LimitedClassedHandleResource.h index ccb50fa06f..9110f49729 100644 --- a/hal/include/HAL/handles/LimitedClassedHandleResource.h +++ b/hal/include/HAL/handles/LimitedClassedHandleResource.h @@ -36,10 +36,11 @@ class LimitedClassedHandleResource { friend class LimitedClassedHandleResourceTest; public: - LimitedClassedHandleResource(const LimitedClassedHandleResource&) = delete; - LimitedClassedHandleResource operator=(const LimitedClassedHandleResource&) = - delete; LimitedClassedHandleResource() = default; + LimitedClassedHandleResource(const LimitedClassedHandleResource&) = delete; + LimitedClassedHandleResource& operator=(const LimitedClassedHandleResource&) = + delete; + THandle Allocate(std::shared_ptr toSet); std::shared_ptr Get(THandle handle); void Free(THandle handle); diff --git a/hal/include/HAL/handles/LimitedHandleResource.h b/hal/include/HAL/handles/LimitedHandleResource.h index 0cbdc235b0..42555e325c 100644 --- a/hal/include/HAL/handles/LimitedHandleResource.h +++ b/hal/include/HAL/handles/LimitedHandleResource.h @@ -35,9 +35,10 @@ class LimitedHandleResource { friend class LimitedHandleResourceTest; public: - LimitedHandleResource(const LimitedHandleResource&) = delete; - LimitedHandleResource operator=(const LimitedHandleResource&) = delete; LimitedHandleResource() = default; + LimitedHandleResource(const LimitedHandleResource&) = delete; + LimitedHandleResource& operator=(const LimitedHandleResource&) = delete; + THandle Allocate(); std::shared_ptr Get(THandle handle); void Free(THandle handle); diff --git a/hal/include/HAL/handles/UnlimitedHandleResource.h b/hal/include/HAL/handles/UnlimitedHandleResource.h index e1d5c13e8c..4866c7af49 100644 --- a/hal/include/HAL/handles/UnlimitedHandleResource.h +++ b/hal/include/HAL/handles/UnlimitedHandleResource.h @@ -37,9 +37,10 @@ class UnlimitedHandleResource { friend class UnlimitedHandleResourceTest; public: - UnlimitedHandleResource(const UnlimitedHandleResource&) = delete; - UnlimitedHandleResource operator=(const UnlimitedHandleResource&) = delete; UnlimitedHandleResource() = default; + UnlimitedHandleResource(const UnlimitedHandleResource&) = delete; + UnlimitedHandleResource& operator=(const UnlimitedHandleResource&) = delete; + THandle Allocate(std::shared_ptr structure); std::shared_ptr Get(THandle handle); void Free(THandle handle);