From 757a29d0137b974fff6ddcc945d76e69ae120ecb Mon Sep 17 00:00:00 2001 From: HampusM Date: Mon, 21 Mar 2022 13:00:36 +0100 Subject: refactor: use MPU6050_light & clean up bloat --- src/common/memory/shared_ptr.hpp | 44 ----------- src/common/memory/shared_ptr.tpp | 153 --------------------------------------- src/common/memory/unique_ptr.hpp | 37 ---------- src/common/memory/unique_ptr.tpp | 55 -------------- 4 files changed, 289 deletions(-) delete mode 100644 src/common/memory/shared_ptr.hpp delete mode 100644 src/common/memory/shared_ptr.tpp delete mode 100644 src/common/memory/unique_ptr.hpp delete mode 100644 src/common/memory/unique_ptr.tpp (limited to 'src/common/memory') diff --git a/src/common/memory/shared_ptr.hpp b/src/common/memory/shared_ptr.hpp deleted file mode 100644 index 7e8a910..0000000 --- a/src/common/memory/shared_ptr.hpp +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -#include - -namespace common -{ -template -class SharedPtr -{ -public: - SharedPtr() noexcept; - SharedPtr(nullptr_t) noexcept; // NOLINT(google-explicit-constructor) - - explicit SharedPtr(Target *target) noexcept; - - SharedPtr(const SharedPtr &shared_ptr) noexcept; - - SharedPtr(SharedPtr &&shared_ptr) noexcept; - - ~SharedPtr() noexcept; - - [[nodiscard]] unsigned int reference_cnt() const noexcept; - - [[nodiscard]] bool is_disposable() const noexcept; - - SharedPtr &operator=(const SharedPtr &rhs) noexcept; - - SharedPtr &operator=(SharedPtr &&rhs) noexcept; - - Target &operator*() const noexcept; - Target *operator->() const noexcept; - -private: - Target *_target = nullptr; - - unsigned int *_reference_cnt; -}; - -template -SharedPtr make_shared(Args &&...args) noexcept; - -} // namespace common - -#include "shared_ptr.tpp" diff --git a/src/common/memory/shared_ptr.tpp b/src/common/memory/shared_ptr.tpp deleted file mode 100644 index d9b57c3..0000000 --- a/src/common/memory/shared_ptr.tpp +++ /dev/null @@ -1,153 +0,0 @@ -#pragma once - -#include "shared_ptr.hpp" - -#include "common/memory.hpp" - -#include - -namespace common -{ - -template -SharedPtr::SharedPtr() noexcept - : _reference_cnt(malloc_s(sizeof(unsigned int))) -{ - (*_reference_cnt) = 0; -} - -template -SharedPtr::SharedPtr(nullptr_t) noexcept - : _reference_cnt(malloc_s(sizeof(unsigned int))) -{ - (*_reference_cnt) = 0; -} - -template -SharedPtr::SharedPtr(Target *target) noexcept - : _target(target), _reference_cnt(malloc_s(sizeof(unsigned int))) -{ - (*_reference_cnt) = 0; -} - -/** - * Copy constructor - */ -template -SharedPtr::SharedPtr(const SharedPtr &shared_ptr) noexcept - : _target(shared_ptr._target), _reference_cnt(shared_ptr._reference_cnt) -{ - (*_reference_cnt)++; -} - -/** - * Move constructor - */ -template -SharedPtr::SharedPtr(SharedPtr &&shared_ptr) noexcept - : _target(shared_ptr._target), _reference_cnt(shared_ptr._reference_cnt) -{ - shared_ptr._target = nullptr; -} - -template -SharedPtr::~SharedPtr() noexcept -{ - if ((*_reference_cnt) != 0U) - { - (*_reference_cnt)--; - } - - if ((*_reference_cnt) == 0U) - { - delete _target; - free(_reference_cnt); - _reference_cnt = nullptr; - } -} - -template -unsigned int SharedPtr::reference_cnt() const noexcept -{ - if (_reference_cnt == nullptr) - { - return 0; - } - - return *_reference_cnt; -} - -template -bool SharedPtr::is_disposable() const noexcept -{ - return _reference_cnt == nullptr || (*_reference_cnt) == 0U; -} - -/** - * Copy assignment operator - */ -template -SharedPtr &SharedPtr::operator=(const SharedPtr &rhs) noexcept -{ - if (&rhs != this) - { - if (is_disposable()) - { - delete _target; - free(_reference_cnt); - } - - _target = nullptr; - _target = rhs._target; - - _reference_cnt = nullptr; - _reference_cnt = rhs._reference_cnt; - (*_reference_cnt)++; - } - - return *this; -} - -/** - * Move assignment operator - */ -template -SharedPtr &SharedPtr::operator=(SharedPtr &&rhs) noexcept -{ - if (&rhs != this) - { - if (is_disposable()) - { - delete _target; - free(_reference_cnt); - } - - _target = rhs._target; - rhs._target = nullptr; - - _reference_cnt = rhs._reference_cnt; - rhs._reference_cnt = nullptr; - } - - return *this; -} - -template -Target &SharedPtr::operator*() const noexcept -{ - return *(_target); -} - -template -Target *SharedPtr::operator->() const noexcept -{ - return _target; -} - -template -SharedPtr make_shared(Args &&...args) noexcept -{ - return SharedPtr(new Target(args...)); -} - -} // namespace common diff --git a/src/common/memory/unique_ptr.hpp b/src/common/memory/unique_ptr.hpp deleted file mode 100644 index 94c02d0..0000000 --- a/src/common/memory/unique_ptr.hpp +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -namespace common -{ -template -class UniquePtr -{ -public: - explicit UniquePtr() = default; - explicit UniquePtr(Target *target); - - // Move constructor - UniquePtr(UniquePtr &&unique_ptr) noexcept; - - // Move assignment operator - UniquePtr &operator=(UniquePtr &&unique_ptr) noexcept; - - // Disable the copy constructor - UniquePtr(const UniquePtr &unique_ptr) = delete; - - // Disable the copy assignment operator - UniquePtr &operator=(const UniquePtr &unique_ptr) = delete; - - ~UniquePtr(); - - Target operator*() const; - Target *operator->() const; - -private: - Target *_target = nullptr; -}; - -template -UniquePtr make_unique(Args... args); -} // namespace common - -#include "unique_ptr.tpp" diff --git a/src/common/memory/unique_ptr.tpp b/src/common/memory/unique_ptr.tpp deleted file mode 100644 index 3cab9ec..0000000 --- a/src/common/memory/unique_ptr.tpp +++ /dev/null @@ -1,55 +0,0 @@ -#pragma once - -#include "unique_ptr.hpp" - -namespace common -{ -template -UniquePtr::UniquePtr(Target *target) : _target(target) -{ -} - -template -UniquePtr::UniquePtr(UniquePtr &&unique_ptr) noexcept - : _target(unique_ptr._target) -{ - unique_ptr._target = nullptr; -} - -template -UniquePtr &UniquePtr::operator=(UniquePtr &&unique_ptr) noexcept -{ - if (&unique_ptr != this) - { - delete _target; - _target = unique_ptr._target; - unique_ptr._target = nullptr; - } - - return *this; -} - -template -UniquePtr::~UniquePtr() -{ - delete _target; -} - -template -Target UniquePtr::operator*() const -{ - return *(_target); -} - -template -Target *UniquePtr::operator->() const -{ - return _target; -} - -template -UniquePtr make_unique(Args... args) -{ - return UniquePtr(new Target(args...)); -} -} // namespace common -- cgit v1.2.3-18-g5258