diff options
author | zaaarf <zaaarf@proton.me> | 2023-09-24 22:03:24 +0200 |
---|---|---|
committer | zaaarf <zaaarf@proton.me> | 2023-09-24 22:03:24 +0200 |
commit | d34075e3cf78474a0203d3aedcb4df63f1159d46 (patch) | |
tree | b8d1342ba6d9fa3f68221844618da932b5933629 /src/openvic-simulation/types | |
parent | 5b0a02a1bd8caad21caa7d000173270d31df4201 (diff) |
fix: fixed multiple compile-time warnings
Diffstat (limited to 'src/openvic-simulation/types')
-rw-r--r-- | src/openvic-simulation/types/IdentifierRegistry.hpp | 1 | ||||
-rw-r--r-- | src/openvic-simulation/types/Vector.cpp | 6 | ||||
-rw-r--r-- | src/openvic-simulation/types/Vector.hpp | 15 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/openvic-simulation/types/IdentifierRegistry.hpp b/src/openvic-simulation/types/IdentifierRegistry.hpp index 414c96d..7b61cf8 100644 --- a/src/openvic-simulation/types/IdentifierRegistry.hpp +++ b/src/openvic-simulation/types/IdentifierRegistry.hpp @@ -177,6 +177,7 @@ namespace OpenVic { for (identifier_index_map_t::value_type const& entry : identifier_index_map) { identifiers.push_back(entry.first); } + return identifiers; } NodeTools::node_callback_t expect_item_identifier(NodeTools::callback_t<T&> callback) { diff --git a/src/openvic-simulation/types/Vector.cpp b/src/openvic-simulation/types/Vector.cpp index 1c9d2f4..aa44710 100644 --- a/src/openvic-simulation/types/Vector.cpp +++ b/src/openvic-simulation/types/Vector.cpp @@ -1,14 +1,8 @@ #include "Vector.hpp" -#include <ostream> -#include <tuple> - using namespace OpenVic; template<typename T> -constexpr vec2_t<T>::vec2_t() = default; - -template<typename T> constexpr vec2_t<T>::vec2_t(T new_val) : x { new_val }, y { new_val } {} template<typename T> diff --git a/src/openvic-simulation/types/Vector.hpp b/src/openvic-simulation/types/Vector.hpp index 66f8d2b..eecd738 100644 --- a/src/openvic-simulation/types/Vector.hpp +++ b/src/openvic-simulation/types/Vector.hpp @@ -8,7 +8,7 @@ namespace OpenVic { struct vec2_t { T x, y; - constexpr vec2_t(); + constexpr vec2_t() = default; constexpr vec2_t(T new_val); constexpr vec2_t(T new_x, T new_y); @@ -21,14 +21,19 @@ namespace OpenVic { constexpr T& operator[](size_t index); constexpr T const& operator[](size_t index) const; - constexpr friend vec2_t operator+(vec2_t const& left, vec2_t const& right); + template <typename S> + constexpr friend vec2_t<S> operator+(vec2_t<S> const& left, vec2_t<S> const& right); constexpr vec2_t& operator+=(vec2_t const& right); - constexpr friend vec2_t operator-(vec2_t const& arg); - constexpr friend vec2_t operator-(vec2_t const& left, vec2_t const& right); + template <typename S> + constexpr friend vec2_t<S> operator-(vec2_t<S> const& arg); + + template <typename S> + constexpr friend vec2_t<S> operator-(vec2_t<S> const& left, vec2_t<S> const& right); constexpr vec2_t& operator-=(vec2_t const& right); - constexpr friend std::ostream& operator<<(std::ostream& stream, vec2_t const& value); + template <typename S> + constexpr friend std::ostream& operator<<(std::ostream& stream, vec2_t<S> const& value); }; using ivec2_t = vec2_t<int64_t>; |