Clean up l_object.cpp (#10512)

[dragonfireclient.git] / src / irrlichttypes.h

diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 33bfa9ee953b4d5ef85943703c8000107d64fc10..794776b2650ffd164246f98314f4d868868d094c 100644 (file)
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef IRRLICHTTYPES_HEADER
-#define IRRLICHTTYPES_HEADER
+#pragma once
 
 /* Ensure that <stdint.h> is included before <irrTypes.h>, unless building on
  * MSVC, to address an irrlicht issue: https://sourceforge.net/p/irrlicht/bugs/433/
@@ -35,6 +34,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 using namespace irr;
 
+namespace irr {
+
 // Irrlicht 1.8+ defines 64bit unsigned symbol in irrTypes.h
 #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
 #ifdef _MSC_VER
@@ -48,6 +49,21 @@ using namespace irr;
 #endif
 #endif
 
+#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 9)
+namespace core {
+       template <typename T>
+       inline T roundingError();
+
+       template <>
+       inline s16 roundingError()
+       {
+               return 0;
+       }
+}
+#endif
+
+}
+
 #define S8_MIN  (-0x7F - 1)
 #define S16_MIN (-0x7FFF - 1)
 #define S32_MIN (-0x7FFFFFFF - 1)
@@ -62,5 +78,3 @@ using namespace irr;
 #define U16_MAX 0xFFFF
 #define U32_MAX 0xFFFFFFFF
 #define U64_MAX 0xFFFFFFFFFFFFFFFF
-
-#endif