aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/utility
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2024-01-22 20:17:38 +0100
committer hop311 <hop3114@gmail.com>2024-01-22 20:25:09 +0100
commitcaa2f31d536f568e485f15537db5e2f79f7616d5 (patch)
tree7cd8a379963af18c24f8dabfe7525b39f2333e0c /src/openvic-simulation/utility
parent8205732a1b95f018f0898a2a4bc62e22f5bee0d3 (diff)
Miscellaneous bug fixes and format cleanupmisc-changes
Diffstat (limited to 'src/openvic-simulation/utility')
-rw-r--r--src/openvic-simulation/utility/StringUtils.hpp4
-rw-r--r--src/openvic-simulation/utility/Utility.hpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/utility/StringUtils.hpp b/src/openvic-simulation/utility/StringUtils.hpp
index ee6d2f9..0df2952 100644
--- a/src/openvic-simulation/utility/StringUtils.hpp
+++ b/src/openvic-simulation/utility/StringUtils.hpp
@@ -198,7 +198,7 @@ namespace OpenVic::StringUtils {
}
template<typename... Args>
- requires (std::is_same_v<std::string_view, Args> && ...)
+ requires(std::is_same_v<std::string_view, Args> && ...)
inline std::string _append_string_views(Args... args) {
std::string ret;
ret.reserve((args.size() + ...));
@@ -207,7 +207,7 @@ namespace OpenVic::StringUtils {
}
template<typename... Args>
- requires (std::is_convertible_v<Args, std::string_view> && ...)
+ requires(std::is_convertible_v<Args, std::string_view> && ...)
inline std::string append_string_views(Args... args) {
return _append_string_views(std::string_view { args }...);
}
diff --git a/src/openvic-simulation/utility/Utility.hpp b/src/openvic-simulation/utility/Utility.hpp
index dbbcf8f..9951532 100644
--- a/src/openvic-simulation/utility/Utility.hpp
+++ b/src/openvic-simulation/utility/Utility.hpp
@@ -32,13 +32,13 @@ namespace OpenVic::utility {
}
template<class T>
- constexpr inline void hash_combine(std::size_t& s, const T& v) {
+ inline constexpr void hash_combine(std::size_t& s, const T& v) {
std::hash<T> h;
s ^= h(v) + 0x9e3779b9 + (s << 6) + (s >> 2);
}
template<size_t Shift, class T>
- constexpr inline void hash_combine_index(std::size_t& s, const T& v) {
+ inline constexpr void hash_combine_index(std::size_t& s, const T& v) {
std::hash<T> h;
if constexpr (Shift == 0) {
s = h(v);