AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18 from lioncash/noexcept 

hecl/hecl: noexcept correctness changes
This commit is contained in:
Phillip Stephens 2019-08-24 00:47:45 -07:00 committed by GitHub
parent fa1c437b16 a7bd496698
commit 52f9922820
1 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
hecl/include/hecl/hecl.hpp
View File

@ -437,36 +437,36 @@ protected:
uint64_t hash = 0; uint64_t hash = 0;
public: public:
constexpr Hash() = default; constexpr Hash() noexcept = default;
constexpr Hash(const Hash&) = default; constexpr Hash(const Hash&) noexcept = default;
constexpr Hash(Hash&&) noexcept = default; constexpr Hash(Hash&&) noexcept = default;
constexpr Hash(uint64_t hashin) : hash(hashin) {} constexpr Hash(uint64_t hashin) noexcept : hash(hashin) {}
explicit Hash(const void* buf, size_t len) : hash(XXH64((uint8_t*)buf, len, 0)) {} explicit Hash(const void* buf, size_t len) noexcept : hash(XXH64(buf, len, 0)) {}
explicit Hash(std::string_view str) : hash(XXH64((uint8_t*)str.data(), str.size(), 0)) {} explicit Hash(std::string_view str) noexcept : hash(XXH64(str.data(), str.size(), 0)) {}
explicit Hash(std::wstring_view str) : hash(XXH64((uint8_t*)str.data(), str.size() * 2, 0)) {} explicit Hash(std::wstring_view str) noexcept : hash(XXH64(str.data(), str.size() * 2, 0)) {}
constexpr uint32_t val32() const { return uint32_t(hash) ^ uint32_t(hash >> 32); } constexpr uint32_t val32() const noexcept { return uint32_t(hash) ^ uint32_t(hash >> 32); }
constexpr uint64_t val64() const { return uint64_t(hash); } constexpr uint64_t val64() const noexcept { return uint64_t(hash); }
constexpr size_t valSizeT() const { return size_t(hash); } constexpr size_t valSizeT() const noexcept { return size_t(hash); }
template <typename T> template <typename T>
constexpr T valT() const; constexpr T valT() const noexcept;
constexpr Hash& operator=(const Hash& other) = default; constexpr Hash& operator=(const Hash& other) noexcept = default;
constexpr Hash& operator=(Hash&& other) noexcept = default; constexpr Hash& operator=(Hash&& other) noexcept = default;
constexpr bool operator==(const Hash& other) const { return hash == other.hash; } constexpr bool operator==(const Hash& other) const noexcept { return hash == other.hash; }
constexpr bool operator!=(const Hash& other) const { return hash != other.hash; } constexpr bool operator!=(const Hash& other) const noexcept { return !operator==(other); }
constexpr bool operator<(const Hash& other) const { return hash < other.hash; } constexpr bool operator<(const Hash& other) const noexcept { return hash < other.hash; }
constexpr bool operator>(const Hash& other) const { return hash > other.hash; } constexpr bool operator>(const Hash& other) const noexcept { return hash > other.hash; }
constexpr bool operator<=(const Hash& other) const { return hash <= other.hash; } constexpr bool operator<=(const Hash& other) const noexcept { return hash <= other.hash; }
constexpr bool operator>=(const Hash& other) const { return hash >= other.hash; } constexpr bool operator>=(const Hash& other) const noexcept { return hash >= other.hash; }
constexpr explicit operator bool() const { return hash != 0; } constexpr explicit operator bool() const noexcept { return hash != 0; }
}; };
template <> template <>
constexpr uint32_t Hash::valT<uint32_t>() const { constexpr uint32_t Hash::valT<uint32_t>() const noexcept {
return val32(); return val32();
} }
template <> template <>
constexpr uint64_t Hash::valT<uint64_t>() const { constexpr uint64_t Hash::valT<uint64_t>() const noexcept {
return val64(); return val64();
} }
@ -619,9 +619,9 @@ public:
* @brief HECL-specific xxhash * @brief HECL-specific xxhash
* @return unique hash value * @return unique hash value
*/ */
Hash hash() const { return m_hash; } Hash hash() const noexcept { return m_hash; }
bool operator==(const ProjectRootPath& other) const { return m_hash == other.m_hash; } bool operator==(const ProjectRootPath& other) const noexcept { return m_hash == other.m_hash; }
bool operator!=(const ProjectRootPath& other) const { return m_hash != other.m_hash; } bool operator!=(const ProjectRootPath& other) const noexcept { return !operator==(other); }
/** /**
* @brief Obtain c-string of final path component * @brief Obtain c-string of final path component
@ -1052,9 +1052,9 @@ public:
* @brief HECL-specific xxhash * @brief HECL-specific xxhash
* @return unique hash value * @return unique hash value
*/ */
Hash hash() const { return m_hash; } Hash hash() const noexcept { return m_hash; }
bool operator==(const ProjectPath& other) const { return m_hash == other.m_hash; } bool operator==(const ProjectPath& other) const noexcept { return m_hash == other.m_hash; }
bool operator!=(const ProjectPath& other) const { return m_hash != other.m_hash; } bool operator!=(const ProjectPath& other) const noexcept { return !operator==(other); }
}; };
/** /**
@ -1176,7 +1176,7 @@ bool IsPathYAML(const hecl::ProjectPath& path);
/* Type-sensitive byte swappers */ /* Type-sensitive byte swappers */
template <typename T> template <typename T>
constexpr T bswap16(T val) { constexpr T bswap16(T val) noexcept {
#if __GNUC__ #if __GNUC__
return __builtin_bswap16(val); return __builtin_bswap16(val);
#elif _WIN32 #elif _WIN32
@ -1187,7 +1187,7 @@ constexpr T bswap16(T val) {
} }
template <typename T> template <typename T>
constexpr T bswap32(T val) { constexpr T bswap32(T val) noexcept {
#if __GNUC__ #if __GNUC__
return __builtin_bswap32(val); return __builtin_bswap32(val);
#elif _WIN32 #elif _WIN32
@ -1200,7 +1200,7 @@ constexpr T bswap32(T val) {
} }
template <typename T> template <typename T>
constexpr T bswap64(T val) { constexpr T bswap64(T val) noexcept {
#if __GNUC__ #if __GNUC__
return __builtin_bswap64(val); return __builtin_bswap64(val);
#elif _WIN32 #elif _WIN32
@ -1214,13 +1214,13 @@ constexpr T bswap64(T val) {
} }
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
constexpr int16_t SBig(int16_t val) { return bswap16(val); } constexpr int16_t SBig(int16_t val) noexcept { return bswap16(val); }
constexpr uint16_t SBig(uint16_t val) { return bswap16(val); } constexpr uint16_t SBig(uint16_t val) noexcept { return bswap16(val); }
constexpr int32_t SBig(int32_t val) { return bswap32(val); } constexpr int32_t SBig(int32_t val) noexcept { return bswap32(val); }
constexpr uint32_t SBig(uint32_t val) { return bswap32(val); } constexpr uint32_t SBig(uint32_t val) noexcept { return bswap32(val); }
constexpr int64_t SBig(int64_t val) { return bswap64(val); } constexpr int64_t SBig(int64_t val) noexcept { return bswap64(val); }
constexpr uint64_t SBig(uint64_t val) { return bswap64(val); } constexpr uint64_t SBig(uint64_t val) noexcept { return bswap64(val); }
constexpr float SBig(float val) { constexpr float SBig(float val) noexcept {
union { union {
float f; float f;
atInt32 i; atInt32 i;
@ -1231,7 +1231,7 @@ constexpr float SBig(float val) {
} uval2 = {bswap32(uval1.i)}; } uval2 = {bswap32(uval1.i)};
return uval2.f; return uval2.f;
} }
constexpr double SBig(double val) { constexpr double SBig(double val) noexcept {
union { union {
double f; double f;
atInt64 i; atInt64 i;
@ -1246,29 +1246,29 @@ constexpr double SBig(double val) {
#define SBIG(q) (((q)&0x000000FF) << 24 | ((q)&0x0000FF00) << 8 | ((q)&0x00FF0000) >> 8 | ((q)&0xFF000000) >> 24) #define SBIG(q) (((q)&0x000000FF) << 24 | ((q)&0x0000FF00) << 8 | ((q)&0x00FF0000) >> 8 | ((q)&0xFF000000) >> 24)
#endif #endif
constexpr int16_t SLittle(int16_t val) { return val; } constexpr int16_t SLittle(int16_t val) noexcept { return val; }
constexpr uint16_t SLittle(uint16_t val) { return val; } constexpr uint16_t SLittle(uint16_t val) noexcept { return val; }
constexpr int32_t SLittle(int32_t val) { return val; } constexpr int32_t SLittle(int32_t val) noexcept { return val; }
constexpr uint32_t SLittle(uint32_t val) { return val; } constexpr uint32_t SLittle(uint32_t val) noexcept { return val; }
constexpr int64_t SLittle(int64_t val) { return val; } constexpr int64_t SLittle(int64_t val) noexcept { return val; }
constexpr uint64_t SLittle(uint64_t val) { return val; } constexpr uint64_t SLittle(uint64_t val) noexcept { return val; }
constexpr float SLittle(float val) { return val; } constexpr float SLittle(float val) noexcept { return val; }
constexpr double SLittle(double val) { return val; } constexpr double SLittle(double val) noexcept { return val; }
#ifndef SLITTLE #ifndef SLITTLE
#define SLITTLE(q) (q) #define SLITTLE(q) (q)
#endif #endif
#else #else
constexpr int16_t SLittle(int16_t val) { return bswap16(val); } constexpr int16_t SLittle(int16_t val) noexcept { return bswap16(val); }
constexpr uint16_t SLittle(uint16_t val) { return bswap16(val); } constexpr uint16_t SLittle(uint16_t val) noexcept { return bswap16(val); }
constexpr int32_t SLittle(int32_t val) { return bswap32(val); } constexpr int32_t SLittle(int32_t val) noexcept { return bswap32(val); }
constexpr uint32_t SLittle(uint32_t val) { return bswap32(val); } constexpr uint32_t SLittle(uint32_t val) noexcept { return bswap32(val); }
constexpr int64_t SLittle(int64_t val) { return bswap64(val); } constexpr int64_t SLittle(int64_t val) noexcept { return bswap64(val); }
constexpr uint64_t SLittle(uint64_t val) { return bswap64(val); } constexpr uint64_t SLittle(uint64_t val) noexcept { return bswap64(val); }
constexpr float SLittle(float val) { constexpr float SLittle(float val) noexcept {
int32_t ival = bswap32(*((int32_t*)(&val))); int32_t ival = bswap32(*((int32_t*)(&val)));
return *((float*)(&ival)); return *((float*)(&ival));
} }
constexpr double SLittle(double val) { constexpr double SLittle(double val) noexcept {
int64_t ival = bswap64(*((int64_t*)(&val))); int64_t ival = bswap64(*((int64_t*)(&val)));
return *((double*)(&ival)); return *((double*)(&ival));
} }
@ -1276,21 +1276,21 @@ constexpr double SLittle(double val) {
#define SLITTLE(q) (((q)&0x000000FF) << 24 | ((q)&0x0000FF00) << 8 | ((q)&0x00FF0000) >> 8 | ((q)&0xFF000000) >> 24) #define SLITTLE(q) (((q)&0x000000FF) << 24 | ((q)&0x0000FF00) << 8 | ((q)&0x00FF0000) >> 8 | ((q)&0xFF000000) >> 24)
#endif #endif
constexpr int16_t SBig(int16_t val) { return val; } constexpr int16_t SBig(int16_t val) noexcept { return val; }
constexpr uint16_t SBig(uint16_t val) { return val; } constexpr uint16_t SBig(uint16_t val) noexcept { return val; }
constexpr int32_t SBig(int32_t val) { return val; } constexpr int32_t SBig(int32_t val) noexcept { return val; }
constexpr uint32_t SBig(uint32_t val) { return val; } constexpr uint32_t SBig(uint32_t val) noexcept { return val; }
constexpr int64_t SBig(int64_t val) { return val; } constexpr int64_t SBig(int64_t val) noexcept { return val; }
constexpr uint64_t SBig(uint64_t val) { return val; } constexpr uint64_t SBig(uint64_t val) noexcept { return val; }
constexpr float SBig(float val) { return val; } constexpr float SBig(float val) noexcept { return val; }
constexpr double SBig(double val) { return val; } constexpr double SBig(double val) noexcept { return val; }
#ifndef SBIG #ifndef SBIG
#define SBIG(q) (q) #define SBIG(q) (q)
#endif #endif
#endif #endif
template <typename SizeT> template <typename SizeT>
constexpr void hash_combine_impl(SizeT& seed, SizeT value) { constexpr void hash_combine_impl(SizeT& seed, SizeT value) noexcept {
seed ^= value + 0x9e3779b9 + (seed << 6) + (seed >> 2); seed ^= value + 0x9e3779b9 + (seed << 6) + (seed >> 2);
} }