diff --git a/YRpp/Base/Always.h b/YRpp/Base/Always.h index d16cd543b..d371051b9 100644 --- a/YRpp/Base/Always.h +++ b/YRpp/Base/Always.h @@ -115,7 +115,7 @@ typedef union { #define MinImpl(a,b) (((a) < (b)) ? (a) : (b)) #define MaxImpl(a,b) (((a) > (b)) ? (a) : (b)) #else -#define MinImp std::min +#define MinImpl std::min #define MaxImpl std::max #endif diff --git a/YRpp/YRMath.h b/YRpp/YRMath.h index dc6025259..6aad0ea4b 100644 --- a/YRpp/YRMath.h +++ b/YRpp/YRMath.h @@ -299,7 +299,7 @@ namespace Math return std::sin((double)a1); } - static FORCEDINLINE double __cdecl sqr(float a1) { + static FORCEDINLINE double __cdecl sqrt(float a1) { return std::sqrt((double)a1); } @@ -358,7 +358,7 @@ namespace Math else if constexpr (std::is_same::value) return static_cast(std::fabs(x)); else - static_assert("Not supported"); + static_assert(!sizeof(T), "Not supported"); } template diff --git a/src/New/Type/PaletteManager.cpp b/src/New/Type/PaletteManager.cpp index 69cdfeb4c..60767defd 100644 --- a/src/New/Type/PaletteManager.cpp +++ b/src/New/Type/PaletteManager.cpp @@ -176,12 +176,12 @@ bool PaletteManager::LoadFromCachedName() void PaletteManager::LoadFromStream(PhobosStreamReader& Stm) { - static_assert("Not implemented!"); + static_assert(!sizeof(PhobosStreamReader*), "Not implemented!"); } void PaletteManager::SaveToStream(PhobosStreamWriter& Stm) { - static_assert("Not implemented!"); + static_assert(!sizeof(PhobosStreamWriter*), "Not implemented!"); } bool CustomPalette::Allocate(std::string name)