Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion YRpp/Base/Always.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions YRpp/YRMath.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -358,7 +358,7 @@ namespace Math
else if constexpr (std::is_same<T, float>::value)
return static_cast<T>(std::fabs(x));
else
static_assert("Not supported");
static_assert(!sizeof(T), "Not supported");
}

template <typename T>
Expand Down
4 changes: 2 additions & 2 deletions src/New/Type/PaletteManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down