diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:47:10 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:47:10 +1100 |
commit | 1c89042016c739815b2d70bcbef4673eef6b63e0 (patch) | |
tree | f7c8e96e744222857c613e5fd14720d2695613c3 /source/core/StarSectorArray2D.hpp | |
parent | 30e1871d3f44629e00a1f66d8164e3e62c7f889f (diff) | |
parent | 7c4fbad2ba7d79580a9ebbf9fde1de117be4d08e (diff) |
Merge pull request #19 from kblaschke/fix-compiler-warnings
Fixed a huge amount of Clang warnings
Diffstat (limited to 'source/core/StarSectorArray2D.hpp')
-rw-r--r-- | source/core/StarSectorArray2D.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/core/StarSectorArray2D.hpp b/source/core/StarSectorArray2D.hpp index 4645804..1dd88a1 100644 --- a/source/core/StarSectorArray2D.hpp +++ b/source/core/StarSectorArray2D.hpp @@ -213,7 +213,7 @@ auto SectorArray2D<ElementT, SectorSize>::sector(Sector const& id) const -> Arra template <typename ElementT, size_t SectorSize> void SectorArray2D<ElementT, SectorSize>::loadSector(Sector const& id, ArrayPtr array) { auto& data = m_sectors(id[0], id[1]); - data = move(array); + data = std::move(array); if (data) m_loadedSectors.add(id); else @@ -224,7 +224,7 @@ template <typename ElementT, size_t SectorSize> typename SectorArray2D<ElementT, SectorSize>::ArrayPtr SectorArray2D<ElementT, SectorSize>::copySector( Sector const& id) { if (auto const& array = m_sectors(id)) - return make_unique<Array>(*array); + return std::make_unique<Array>(*array); else return {}; } @@ -235,7 +235,7 @@ typename SectorArray2D<ElementT, SectorSize>::ArrayPtr SectorArray2D<ElementT, S ArrayPtr ret; m_loadedSectors.remove(id); std::swap(m_sectors(id[0], id[1]), ret); - return move(ret); + return ret; } template <typename ElementT, size_t SectorSize> @@ -268,14 +268,14 @@ template <typename ElementT, size_t SectorSize> template <typename Function> bool SectorArray2D<ElementT, SectorSize>::eval( size_t minX, size_t minY, size_t width, size_t height, Function&& function, bool evalEmpty) const { - return const_cast<SectorArray2D*>(this)->evalPriv(minX, minY, width, height, forward<Function>(function), evalEmpty); + return const_cast<SectorArray2D*>(this)->evalPriv(minX, minY, width, height, std::forward<Function>(function), evalEmpty); } template <typename ElementT, size_t SectorSize> template <typename Function> bool SectorArray2D<ElementT, SectorSize>::eval( size_t minX, size_t minY, size_t width, size_t height, Function&& function, bool evalEmpty) { - return evalPriv(minX, minY, width, height, forward<Function>(function), evalEmpty); + return evalPriv(minX, minY, width, height, std::forward<Function>(function), evalEmpty); } template <typename ElementT, size_t SectorSize> @@ -283,14 +283,14 @@ template <typename Function> bool SectorArray2D<ElementT, SectorSize>::evalColumns( size_t minX, size_t minY, size_t width, size_t height, Function&& function, bool evalEmpty) const { return const_cast<SectorArray2D*>(this)->evalColumnsPriv( - minX, minY, width, height, forward<Function>(function), evalEmpty); + minX, minY, width, height, std::forward<Function>(function), evalEmpty); } template <typename ElementT, size_t SectorSize> template <typename Function> bool SectorArray2D<ElementT, SectorSize>::evalColumns( size_t minX, size_t minY, size_t width, size_t height, Function&& function, bool evalEmpty) { - return evalColumnsPriv(minX, minY, width, height, forward<Function>(function), evalEmpty); + return evalColumnsPriv(minX, minY, width, height, std::forward<Function>(function), evalEmpty); } template <typename ElementT, size_t SectorSize> |