From 2489c453c0b6cd93a9ade17d42b7aad4ec238750 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 8 Feb 2023 21:00:44 +0100 Subject: compat/prelude: don't declare size_t in global namespace --- compat/prelude.hpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/compat/prelude.hpp b/compat/prelude.hpp index 30273a31..ab2fdfd2 100644 --- a/compat/prelude.hpp +++ b/compat/prelude.hpp @@ -1,5 +1,6 @@ #pragma once +namespace floormat::types { #ifdef _MSC_VER #if defined _WIN64 typedef unsigned __int64 size_t; @@ -9,6 +10,7 @@ typedef unsigned int size_t; #else typedef __SIZE_TYPE__ size_t; #endif +} // namespace floormat::types namespace Corrade::Containers { @@ -30,9 +32,9 @@ template class Vector3; template class Vector4; } // namespace Magnum::Math namespace Magnum { -using Vector2uz = Math::Vector2<::size_t>; -using Vector3uz = Math::Vector3<::size_t>; -using Vector4uz = Math::Vector4<::size_t>; +using Vector2uz = Math::Vector2; +using Vector3uz = Math::Vector3; +using Vector4uz = Math::Vector4; } // namespace Magnum namespace floormat { @@ -40,6 +42,7 @@ namespace floormat { using namespace ::Corrade::Containers; using namespace ::Corrade::Containers::Literals; using namespace ::Magnum::Math::Literals; + using namespace ::floormat::types; using Debug [[maybe_unused]] = ::Corrade::Utility::Debug; using Error [[maybe_unused]] = ::Corrade::Utility::Error; namespace Path = Corrade::Utility::Path; // NOLINT(misc-unused-alias-decls) -- cgit v1.2.3