fix linux build

n0lavar · Jan 2, 2024 · 3515172 · 3515172
1 parent ae4cb75
commit 3515172
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/include/qx/containers/components.inl b/include/qx/containers/components.inl
@@ -38,7 +38,7 @@ component_t* components<base_component_t>::add(
         pRawComponent,
         [ePriority, statusFlags, pRawComponent](SClassData& classData)
         {
-            classData.priorityCache.emplace(ePriority, SClassData::SCacheData(pRawComponent, statusFlags));
+            classData.priorityCache.emplace(ePriority, typename SClassData::SCacheData(pRawComponent, statusFlags));
         });
     classData.components.push_back(std::move(pComponent));
     return pRawComponent;

diff --git a/include/qx/patterns/contiguous_iterator/base_iterator.h b/include/qx/patterns/contiguous_iterator/base_iterator.h
@@ -16,12 +16,6 @@
 namespace qx
 {
 
-template<class container_t, class derived_t>
-class base_forward_iterator;
-
-template<class container_t, class derived_t>
-class base_reverse_iterator;
-
 /**
 
     @class   base_iterator
@@ -37,8 +31,11 @@ template<class container_t>
 class base_iterator
 {
 public:
-    friend base_forward_iterator;
-    friend base_reverse_iterator;
+    template<class container_t_, class derived_t_>
+    friend class base_forward_iterator;
+
+    template<class container_t_, class derived_t_>
+    friend class base_reverse_iterator;
 
     using difference_type = typename container_t::difference_type;
     using size_type       = typename container_t::size_type;

diff --git a/tests/test_concepts.cpp b/tests/test_concepts.cpp
@@ -147,4 +147,4 @@ class C3 : public C1<float>
 
 static_assert(qx::derived_from_template_c<C2, C1>);
 static_assert(qx::derived_from_template_c<C3, C1>);
-static_assert(!qx::derived_from_template_c<C, C1>);
+static_assert(!qx::derived_from_template_c<C<int>, C1>);
diff --git a/tests/test_rtti.cpp b/tests/test_rtti.cpp
@@ -15,6 +15,7 @@
 #include <qx/rtti/rtti_cast.h>
 
 #include <memory>
+#include <source_location>
 
 class CClass1
 {
@@ -196,9 +197,9 @@ TEST(rtti, class_id)
 }
 
 template<class T>
-void TestDerivedFrom(const auto& pClass, bool bExpect)
+void TestDerivedFrom(const auto& pClass, bool bExpect, std::source_location sr = std::source_location::current())
 {
-    EXPECT_EQ(pClass->template is_derived_from<T>(), bExpect);
+    EXPECT_EQ(pClass->template is_derived_from<T>(), bExpect) << "Line: " << sr.line();
 
     if constexpr (qx::details::has_get_class_id_static<T>)
     {