diff --git a/src/typed-graphics/backend/Backend.cc b/src/typed-graphics/backend/Backend.cc index f9309f0a9d5fbe2ab5373bf8fb3c91b2b72ca0e4..671bd03b34309ba2c97b17118a40f9bf849978f1 100644 --- a/src/typed-graphics/backend/Backend.cc +++ b/src/typed-graphics/backend/Backend.cc @@ -1,6 +1,6 @@ #include "Backend.hh" -#include <typed-graphics/common/assert.hh> +#include <typed-geometry/common/assert.hh> #ifdef TG_BACKEND_VULKAN diff --git a/src/typed-graphics/common/assert.cc b/src/typed-graphics/common/assert.cc deleted file mode 100644 index 3bab4aca37530dd4da4c5126af70bcad3648c121..0000000000000000000000000000000000000000 --- a/src/typed-graphics/common/assert.cc +++ /dev/null @@ -1,7 +0,0 @@ -#include "assert.hh" - -#include <utility> - -#include "exceptions.hh" - -void tg::assertion_fail() { throw assert_exception(); } diff --git a/src/typed-graphics/common/assert.hh b/src/typed-graphics/common/assert.hh deleted file mode 100644 index d8571b6883f364a12c712fa41811ce6ccd8ee89b..0000000000000000000000000000000000000000 --- a/src/typed-graphics/common/assert.hh +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include <cstdio> - -#include "macros.hh" - -// expr, msg, args -#define TG_ASSERT(expr, ...) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf(stderr, "%s", "Assertion `" #expr "' failed."); \ - fprintf(stderr, "%s in %s:%d", __func__, __FILE__, __LINE__); \ - fprintf(stderr, __VA_ARGS__); \ - assertion_fail(); \ - } \ - } while (0) // force ; - -namespace tg -{ -TG_NO_INLINE void assertion_fail(); -} // namespace tg diff --git a/src/typed-graphics/tg-lean.hh b/src/typed-graphics/tg-lean.hh index 98ecf00e3015cd0a9fd1c97786cf225235b0c7b7..ed1ac87d740503c234062f94e1cb919a2d04ecb5 100644 --- a/src/typed-graphics/tg-lean.hh +++ b/src/typed-graphics/tg-lean.hh @@ -2,7 +2,7 @@ #include <memory> -#include <typed-graphics/common/assert.hh> +#include <typed-geometry/common/assert.hh> #include <typed-graphics/common/macros.hh> #include <typed-graphics/common/traits.hh> diff --git a/src/typed-graphics/tg.hh b/src/typed-graphics/tg.hh index ab6db35bc1e69c3721021abee36744e130f80562..54be216b29ece680964b3cb8c9d815464ba1f63c 100644 --- a/src/typed-graphics/tg.hh +++ b/src/typed-graphics/tg.hh @@ -4,7 +4,6 @@ #include <typed-geometry/tg-lean.hh> // Common -#include "common/assert.hh" #include "common/logging.hh" #include "common/macros.hh" #include "common/trace.hh"