瀏覽代碼

rename overloaded function so linux and mac stop bitching

marauder2k7 6 月之前
父節點
當前提交
cd7666bf2a
共有 2 個文件被更改,包括 9 次插入9 次删除
  1. 2 2
      Engine/source/console/propertyParsing.h
  2. 7 7
      Engine/source/math/mathTypes.cpp

+ 2 - 2
Engine/source/console/propertyParsing.h

@@ -168,12 +168,12 @@ namespace PropertyInfo
    {
       static const U32 bufSize = 256;
       char* buffer = Con::getReturnBuffer(bufSize);
-      FormatProperty<T,count>(dataPtr, buffer, bufSize);
+      FormatPropertyBuffer<T,count>(dataPtr, buffer, bufSize);
       return buffer;
    }
 
    template<typename T, size_t count>
-   char* FormatProperty(const void* dataPtr, char* buffer, U32 bufSize)
+   char* FormatPropertyBuffer(const void* dataPtr, char* buffer, U32 bufSize)
    {
       const T* values = reinterpret_cast<const T*>(dataPtr);
       char* ptr = buffer;

+ 7 - 7
Engine/source/math/mathTypes.cpp

@@ -394,11 +394,11 @@ ConsoleGetType( TypeMatrixF )
    char* buffer = Con::getReturnBuffer(bufSize);
 
    F32* mat = (F32*)dptr;
-   buffer = PropertyInfo::FormatProperty<F32, 3>(mat + 0, buffer, bufSize);
+   buffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(mat + 0, buffer, bufSize);
    *buffer++ = ' ';
-   buffer = PropertyInfo::FormatProperty<F32, 3>(mat + 4, buffer, bufSize);
+   buffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(mat + 4, buffer, bufSize);
    *buffer++ = ' ';
-   buffer = PropertyInfo::FormatProperty<F32, 3>(mat + 8, buffer, bufSize);
+   buffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(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<S32, 2>(pEase + 0, buffer, bufSize);
+   buffer = PropertyInfo::FormatPropertyBuffer<S32, 2>(pEase + 0, buffer, bufSize);
    *buffer++ = ' ';
-   buffer = PropertyInfo::FormatProperty<F32, 2>(pEase + 2, buffer, bufSize);
+   buffer = PropertyInfo::FormatPropertyBuffer<F32, 2>(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<F32, 3>(out, returnBuffer, bufSize);
+      returnBuffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(out, returnBuffer, bufSize);
    }
    else if (pt->mRotationType == RotationF::AxisAngle)
    {
       AngAxisF out = pt->asAxisAngle(RotationF::Degrees);
-      returnBuffer = PropertyInfo::FormatProperty<F32, 4>(&out, returnBuffer, bufSize);
+      returnBuffer = PropertyInfo::FormatPropertyBuffer<F32, 4>(&out, returnBuffer, bufSize);
    }
    *returnBuffer = '\0'; // null-terminate just in case