From 49a5784bf4066d0fd32ccef5790fb7ee7528eab5 Mon Sep 17 00:00:00 2001
From: alemuntoni <alemuntoni@users.noreply.github.com>
Date: Thu, 9 Jan 2025 17:00:26 +0100
Subject: [PATCH] [render] fix clang build error

---
 tests/render/000-static-asserts/drawers.h     | 85 +++++++++----------
 .../render/include/vclib/imgui/imgui_drawer.h |  2 +-
 .../vclib/render/drawers/event_drawer.h       | 10 +++
 3 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/tests/render/000-static-asserts/drawers.h b/tests/render/000-static-asserts/drawers.h
index 145262d65..bd5b8ab54 100644
--- a/tests/render/000-static-asserts/drawers.h
+++ b/tests/render/000-static-asserts/drawers.h
@@ -45,9 +45,6 @@
 #include <vclib/bgfx/drawers/text_drawer.h>
 #endif
 
-template<typename DR>
-using BlockEventDrawer = vcl::EventDrawer<DR, true>;
-
 #ifdef VCLIB_WITH_QT
 template<typename DR>
 using WMQ = vcl::qt::WidgetManager<DR>;
@@ -65,7 +62,7 @@ void drawersStaticAssertsWM()
 
     using RendererTypePD  = Renderer<WM, Canvas, PlainDrawer>;
     using RendererTypeED  = Renderer<WM, Canvas, EventDrawer>;
-    using RendererTypeBED = Renderer<WM, Canvas, BlockEventDrawer>;
+    using RendererTypeBED = Renderer<WM, Canvas, BlockerEventDrawer>;
     using RendererTypeVD  = Renderer<WM, Canvas, ViewerDrawer>;
 
     // PlainDrawer
@@ -166,70 +163,70 @@ void drawersStaticAssertsWM()
         !CanBlockEventDrawerConcept<EventDrawer<RendererTypeED>&&>,
         "EventDrawer&& does satisfy the CanBlockEventDrawerConcept");
 
-    // BlockEventDrawer
+    // BlockerEventDrawer
     static_assert(
-        DrawerConcept<BlockEventDrawer<RendererTypeBED>>,
-        "BlockEventDrawer does not satisfy the DrawerConcept");
+        DrawerConcept<BlockerEventDrawer<RendererTypeBED>>,
+        "BlockerEventDrawer does not satisfy the DrawerConcept");
     static_assert(
-        DrawerConcept<const BlockEventDrawer<RendererTypeBED>>,
-        "const BlockEventDrawer does not satisfy the DrawerConcept");
+        DrawerConcept<const BlockerEventDrawer<RendererTypeBED>>,
+        "const BlockerEventDrawer does not satisfy the DrawerConcept");
     static_assert(
-        DrawerConcept<BlockEventDrawer<RendererTypeBED>&>,
-        "BlockEventDrawer& does not satisfy the DrawerConcept");
+        DrawerConcept<BlockerEventDrawer<RendererTypeBED>&>,
+        "BlockerEventDrawer& does not satisfy the DrawerConcept");
     static_assert(
-        DrawerConcept<const BlockEventDrawer<RendererTypeBED>&>,
-        "const BlockEventDrawer& does not satisfy the DrawerConcept");
+        DrawerConcept<const BlockerEventDrawer<RendererTypeBED>&>,
+        "const BlockerEventDrawer& does not satisfy the DrawerConcept");
     static_assert(
-        DrawerConcept<BlockEventDrawer<RendererTypeBED>&&>,
-        "BlockEventDrawer&& does not satisfy the DrawerConcept");
+        DrawerConcept<BlockerEventDrawer<RendererTypeBED>&&>,
+        "BlockerEventDrawer&& does not satisfy the DrawerConcept");
 
     static_assert(
-        EventDrawerConcept<BlockEventDrawer<RendererTypeBED>>,
-        "BlockEventDrawer does not satisfy the EventDrawerConcept");
+        EventDrawerConcept<BlockerEventDrawer<RendererTypeBED>>,
+        "BlockerEventDrawer does not satisfy the EventDrawerConcept");
     static_assert(
-        EventDrawerConcept<const BlockEventDrawer<RendererTypeBED>>,
-        "const BlockEventDrawer does not satisfy the EventDrawerConcept");
+        EventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>>,
+        "const BlockerEventDrawer does not satisfy the EventDrawerConcept");
     static_assert(
-        EventDrawerConcept<BlockEventDrawer<RendererTypeBED>&>,
-        "BlockEventDrawer& does not satisfy the EventDrawerConcept");
+        EventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&>,
+        "BlockerEventDrawer& does not satisfy the EventDrawerConcept");
     static_assert(
-        EventDrawerConcept<const BlockEventDrawer<RendererTypeBED>&>,
+        EventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>&>,
         "const BlockEventDrawer& does not satisfy the EventDrawerConcept");
     static_assert(
-        EventDrawerConcept<BlockEventDrawer<RendererTypeBED>&&>,
-        "BlockEventDrawer&& does not satisfy the EventDrawerConcept");
+        EventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&&>,
+        "BlockerEventDrawer&& does not satisfy the EventDrawerConcept");
 
     static_assert(
-        !CantBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>>,
-        "BlockEventDrawer does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>>,
+        "BlockerEventDrawer does satisfy the CantBlockEventDrawerConcept");
     static_assert(
-        !CantBlockEventDrawerConcept<const BlockEventDrawer<RendererTypeBED>>,
-        "const BlockEventDrawer does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>>,
+        "const BlockerEventDrawer does satisfy the CantBlockEventDrawerConcept");
     static_assert(
-        !CantBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>&>,
-        "BlockEventDrawer& does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&>,
+        "BlockerEventDrawer& does satisfy the CantBlockEventDrawerConcept");
     static_assert(
-        !CantBlockEventDrawerConcept<const BlockEventDrawer<RendererTypeBED>&>,
-        "const BlockEventDrawer& does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>&>,
+        "const BlockerEventDrawer& does satisfy the CantBlockEventDrawerConcept");
     static_assert(
-        !CantBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>&&>,
-        "BlockEventDrawer&& does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&&>,
+        "BlockerEventDrawer&& does satisfy the CantBlockEventDrawerConcept");
 
     static_assert(
-        CanBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>>,
-        "BlockEventDrawer does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>>,
+        "BlockerEventDrawer does not satisfy the CanBlockEventDrawerConcept");
     static_assert(
-        CanBlockEventDrawerConcept<const BlockEventDrawer<RendererTypeBED>>,
-        "const BlockEventDrawer does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>>,
+        "const BlockerEventDrawer does not satisfy the CanBlockEventDrawerConcept");
     static_assert(
-        CanBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>&>,
-        "BlockEventDrawer& does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&>,
+        "BlockerEventDrawer& does not satisfy the CanBlockEventDrawerConcept");
     static_assert(
-        CanBlockEventDrawerConcept<const BlockEventDrawer<RendererTypeBED>&>,
-        "const BlockEventDrawer& does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>&>,
+        "const BlockerEventDrawer& does not satisfy the CanBlockEventDrawerConcept");
     static_assert(
-        CanBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>&&>,
-        "BlockEventDrawer&& does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&&>,
+        "BlockerEventDrawer&& does not satisfy the CanBlockEventDrawerConcept");
 
     // ViewerDrawer
     static_assert(
diff --git a/vclib/render/include/vclib/imgui/imgui_drawer.h b/vclib/render/include/vclib/imgui/imgui_drawer.h
index 2923ed8ec..a35d16712 100644
--- a/vclib/render/include/vclib/imgui/imgui_drawer.h
+++ b/vclib/render/include/vclib/imgui/imgui_drawer.h
@@ -41,7 +41,7 @@
 namespace vcl::imgui {
 
 template<typename DerivedRenderer>
-class ImGuiDrawer : public EventDrawer<DerivedRenderer, true>
+class ImGuiDrawer : public BlockerEventDrawer<DerivedRenderer>
 {
 protected:
     using DRT = DerivedRenderer;
diff --git a/vclib/render/include/vclib/render/drawers/event_drawer.h b/vclib/render/include/vclib/render/drawers/event_drawer.h
index 4dd194d97..87e250021 100644
--- a/vclib/render/include/vclib/render/drawers/event_drawer.h
+++ b/vclib/render/include/vclib/render/drawers/event_drawer.h
@@ -29,6 +29,8 @@
 
 namespace vcl {
 
+namespace detail {
+
 /**
  * @brief The EventDrawer class is a base class for all drawers that handle
  * events.
@@ -186,6 +188,14 @@ class EventDrawer<DerivedRenderer, true> : public PlainDrawer<DerivedRenderer>
     }
 };
 
+} // namespace detail
+
+template<typename DerivedRenderer>
+using EventDrawer = detail::EventDrawer<DerivedRenderer, false>;
+
+template<typename DerivedRenderer>
+using BlockerEventDrawer = detail::EventDrawer<DerivedRenderer, true>;
+
 } // namespace vcl
 
 #endif // EVENT_DRAWER_H