From 1ecc06239e37010b5f7ae36850b84a61bce9084c Mon Sep 17 00:00:00 2001
From: James Walker <jw@jwwalker.com>
Date: Mon, 16 Dec 2024 09:48:45 -0800
Subject: [PATCH] Fix overload ambiguity problem wth StringConverter::toString

---
 OgreMain/include/OgreStringConverter.h | 14 ++++----------
 OgreMain/src/OgreStringConverter.cpp   | 13 +++----------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/OgreMain/include/OgreStringConverter.h b/OgreMain/include/OgreStringConverter.h
index 9cdef765003..7111905318a 100644
--- a/OgreMain/include/OgreStringConverter.h
+++ b/OgreMain/include/OgreStringConverter.h
@@ -90,23 +90,17 @@ namespace Ogre
         /** Converts an int to a String. */
         static String toString( int val, unsigned short width = 0, char fill = ' ',
                                 std::ios::fmtflags flags = std::ios::fmtflags( 0 ) );
-#if OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_64 || OGRE_PLATFORM == OGRE_PLATFORM_APPLE || \
-    OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
         /** Converts an unsigned int to a String. */
         static String toString( unsigned int val, unsigned short width = 0, char fill = ' ',
                                 std::ios::fmtflags flags = std::ios::fmtflags( 0 ) );
-#    if OGRE_COMPILER == OGRE_COMPILER_MSVC
         /** Converts an unsigned long to a String. */
         static String toString( unsigned long val, unsigned short width = 0, char fill = ' ',
                                 std::ios::fmtflags flags = std::ios::fmtflags( 0 ) );
-#    endif
-#else
-        /** Converts an unsigned long to a String. */
-        static String toString( unsigned long val, unsigned short width = 0, char fill = ' ',
+        /** Converts a long long to a String. */
+        static String toString( long long val, unsigned short width = 0, char fill = ' ',
                                 std::ios::fmtflags flags = std::ios::fmtflags( 0 ) );
-#endif
-        /** Converts a size_t to a String. */
-        static String toString( size_t val, unsigned short width = 0, char fill = ' ',
+        /** Converts an unsigned long long to a String. */
+        static String toString( unsigned long long val, unsigned short width = 0, char fill = ' ',
                                 std::ios::fmtflags flags = std::ios::fmtflags( 0 ) );
         /** Converts a long to a String. */
         static String toString( long val, unsigned short width = 0, char fill = ' ',
diff --git a/OgreMain/src/OgreStringConverter.cpp b/OgreMain/src/OgreStringConverter.cpp
index 5162685a5ff..90a966d1f92 100644
--- a/OgreMain/src/OgreStringConverter.cpp
+++ b/OgreMain/src/OgreStringConverter.cpp
@@ -149,38 +149,31 @@ namespace Ogre
     {
         return _toString( val, width, fill, flags );
     }
-#if OGRE_ARCH_TYPE == OGRE_ARCHITECTURE_64 || OGRE_PLATFORM == OGRE_PLATFORM_APPLE || \
-    OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
     //-----------------------------------------------------------------------
     String StringConverter::toString( unsigned int val, unsigned short width, char fill,
                                       std::ios::fmtflags flags )
     {
         return _toString( val, width, fill, flags );
     }
-#    if OGRE_COMPILER == OGRE_COMPILER_MSVC
-    //-----------------------------------------------------------------------
     String StringConverter::toString( unsigned long val, unsigned short width, char fill,
                                       std::ios::fmtflags flags )
     {
         return _toString( val, width, fill, flags );
     }
-#    endif
-#else
     //-----------------------------------------------------------------------
-    String StringConverter::toString( unsigned long val, unsigned short width, char fill,
+    String StringConverter::toString( long val, unsigned short width, char fill,
                                       std::ios::fmtflags flags )
     {
         return _toString( val, width, fill, flags );
     }
-#endif
     //-----------------------------------------------------------------------
-    String StringConverter::toString( size_t val, unsigned short width, char fill,
+    String StringConverter::toString( long long val, unsigned short width, char fill,
                                       std::ios::fmtflags flags )
     {
         return _toString( val, width, fill, flags );
     }
     //-----------------------------------------------------------------------
-    String StringConverter::toString( long val, unsigned short width, char fill,
+    String StringConverter::toString( unsigned long long val, unsigned short width, char fill,
                                       std::ios::fmtflags flags )
     {
         return _toString( val, width, fill, flags );