From cd7666bf2af104fb4b472060307e71a77652194c Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Wed, 9 Apr 2025 16:05:22 +0100 Subject: [PATCH] rename overloaded function so linux and mac stop bitching --- Engine/source/console/propertyParsing.h | 4 ++-- Engine/source/math/mathTypes.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Engine/source/console/propertyParsing.h b/Engine/source/console/propertyParsing.h index 2608077c6..dc446d8f1 100644 --- a/Engine/source/console/propertyParsing.h +++ b/Engine/source/console/propertyParsing.h @@ -168,12 +168,12 @@ namespace PropertyInfo { static const U32 bufSize = 256; char* buffer = Con::getReturnBuffer(bufSize); - FormatProperty(dataPtr, buffer, bufSize); + FormatPropertyBuffer(dataPtr, buffer, bufSize); return buffer; } template - char* FormatProperty(const void* dataPtr, char* buffer, U32 bufSize) + char* FormatPropertyBuffer(const void* dataPtr, char* buffer, U32 bufSize) { const T* values = reinterpret_cast(dataPtr); char* ptr = buffer; diff --git a/Engine/source/math/mathTypes.cpp b/Engine/source/math/mathTypes.cpp index c9b36a0e1..c1292ec7d 100644 --- a/Engine/source/math/mathTypes.cpp +++ b/Engine/source/math/mathTypes.cpp @@ -394,11 +394,11 @@ ConsoleGetType( TypeMatrixF ) char* buffer = Con::getReturnBuffer(bufSize); F32* mat = (F32*)dptr; - buffer = PropertyInfo::FormatProperty(mat + 0, buffer, bufSize); + buffer = PropertyInfo::FormatPropertyBuffer(mat + 0, buffer, bufSize); *buffer++ = ' '; - buffer = PropertyInfo::FormatProperty(mat + 4, buffer, bufSize); + buffer = PropertyInfo::FormatPropertyBuffer(mat + 4, buffer, bufSize); *buffer++ = ' '; - buffer = PropertyInfo::FormatProperty(mat + 8, buffer, bufSize); + buffer = PropertyInfo::FormatPropertyBuffer(mat + 8, buffer, bufSize); *buffer = '\0'; // null-terminate just in case return buffer; @@ -631,9 +631,9 @@ ConsoleGetType( TypeEaseF ) char* buffer = Con::getReturnBuffer(bufSize); EaseF* pEase = (EaseF*)dptr; - buffer = PropertyInfo::FormatProperty(pEase + 0, buffer, bufSize); + buffer = PropertyInfo::FormatPropertyBuffer(pEase + 0, buffer, bufSize); *buffer++ = ' '; - buffer = PropertyInfo::FormatProperty(pEase + 2, buffer, bufSize); + buffer = PropertyInfo::FormatPropertyBuffer(pEase + 2, buffer, bufSize); *buffer = '\0'; // null-terminate just in case return buffer; @@ -678,12 +678,12 @@ ConsoleGetType(TypeRotationF) if (pt->mRotationType == RotationF::Euler) { EulerF out = pt->asEulerF(RotationF::Degrees); - returnBuffer = PropertyInfo::FormatProperty(out, returnBuffer, bufSize); + returnBuffer = PropertyInfo::FormatPropertyBuffer(out, returnBuffer, bufSize); } else if (pt->mRotationType == RotationF::AxisAngle) { AngAxisF out = pt->asAxisAngle(RotationF::Degrees); - returnBuffer = PropertyInfo::FormatProperty(&out, returnBuffer, bufSize); + returnBuffer = PropertyInfo::FormatPropertyBuffer(&out, returnBuffer, bufSize); } *returnBuffer = '\0'; // null-terminate just in case