From cf6c5668f1d41a0fe02f97351a522ccfb3f245d4 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 9 Oct 2022 12:22:14 +0200 Subject: a --- compat/assert.hpp | 16 ++++++++-------- compat/enum-bitset.hpp | 4 ++-- compat/prelude.hpp | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'compat') diff --git a/compat/assert.hpp b/compat/assert.hpp index 3b59fd56..860a9cde 100644 --- a/compat/assert.hpp +++ b/compat/assert.hpp @@ -4,7 +4,7 @@ #include #include -namespace Magnum::Examples::detail { +namespace floormat::detail { template constexpr void emit_debug(const char(&pfx)[M], const char(&fmt)[N], Xs... xs) noexcept @@ -35,14 +35,14 @@ constexpr inline void abort(const char (&fmt)[N], Xs... xs) noexcept } } -} // namespace Magnum::Examples::detail +} // namespace floormat::detail -#define ABORT(...) ::Magnum::Examples::detail::abort(__VA_ARGS__) +#define ABORT(...) ::floormat::detail::abort(__VA_ARGS__) #define ASSERT(...) \ do { \ if (!(__VA_ARGS__)) { \ - ::Magnum::Examples::detail:: \ + ::floormat::detail:: \ abort("assertion failed: '%s' in %s:%d", \ #__VA_ARGS__, __FILE__, __LINE__); \ } \ @@ -55,7 +55,7 @@ constexpr inline void abort(const char (&fmt)[N], Xs... xs) noexcept return (var); \ })() -#define WARN(...) ::Magnum::Examples::detail::emit_debug("warning: ", __VA_ARGS__) -#define ERR(...) ::Magnum::Examples::detail::emit_debug("error: ", __VA_ARGS__) -#define MESSAGE(...) ::Magnum::Examples::detail::emit_debug("", __VA_ARGS__) -#define DEBUG(...) ::Magnum::Examples::detail::emit_debug("", __VA_ARGS__) +#define WARN(...) ::floormat::detail::emit_debug("warning: ", __VA_ARGS__) +#define ERR(...) ::floormat::detail::emit_debug("error: ", __VA_ARGS__) +#define MESSAGE(...) ::floormat::detail::emit_debug("", __VA_ARGS__) +#define DEBUG(...) ::floormat::detail::emit_debug("", __VA_ARGS__) diff --git a/compat/enum-bitset.hpp b/compat/enum-bitset.hpp index bf705138..95c82ff7 100644 --- a/compat/enum-bitset.hpp +++ b/compat/enum-bitset.hpp @@ -1,7 +1,7 @@ #pragma once #include -namespace Magnum::Examples { +namespace floormat { template struct enum_bitset : std::bitset<(std::size_t)Enum::MAX> { @@ -14,4 +14,4 @@ struct enum_bitset : std::bitset<(std::size_t)Enum::MAX> { } }; -} // namespace Magnum::Examples +} // namespace floormat diff --git a/compat/prelude.hpp b/compat/prelude.hpp index 8b0387c5..077d5a75 100644 --- a/compat/prelude.hpp +++ b/compat/prelude.hpp @@ -1,6 +1,6 @@ #pragma once namespace Magnum {} -namespace GAME_PROJECT_NAME { +namespace floormat { using namespace ::Magnum; -} // namespace GAME_PROJECT_NAME +} // namespace floormat -- cgit v1.2.3