Fix build errors and warnings

pratzl · pratzl · commit 59e2c8205336 · 2025-12-28T17:02:06.000-05:00
- Fix C4099 warnings by changing struct to class in all traits forward declarations to match dynamic_graph.hpp
- Fix static assertion failures for unordered container iterators to work with both MSVC (bidirectional) and GCC (forward-only) implementations
- Fix CMake clang-debug configuration to use clang-cl instead of clang++ on Windows
- Fix narrowing conversion errors in test files for clang compiler by adding explicit static_cast

All tests now build successfully on MSVC and Clang on Windows.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -103,12 +103,12 @@
     {
       "name": "windows-clang-debug",
       "displayName": "Windows Clang Debug",
-      "description": "Windows development build with Clang (Debug)",
+      "description": "Windows development build with Clang (Debug) - requires MSVC environment",
       "inherits": "windows-base",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_C_COMPILER": "clang",
-        "CMAKE_CXX_COMPILER": "clang++",
+        "CMAKE_C_COMPILER": "clang-cl",
+        "CMAKE_CXX_COMPILER": "clang-cl",
         "BUILD_TESTS": "ON",
         "BUILD_EXAMPLES": "ON"
       }
@@ -120,8 +120,8 @@
       "inherits": "windows-base",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_C_COMPILER": "clang",
-        "CMAKE_CXX_COMPILER": "clang++",
+        "CMAKE_C_COMPILER": "clang-cl",
+        "CMAKE_CXX_COMPILER": "clang-cl",
         "BUILD_TESTS": "ON",
         "BUILD_EXAMPLES": "ON"
       }
diff --git a/include/graph/container/traits/dod_graph_traits.hpp b/include/graph/container/traits/dod_graph_traits.hpp
@@ -6,10 +6,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/dofl_graph_traits.hpp b/include/graph/container/traits/dofl_graph_traits.hpp
@@ -7,10 +7,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/dol_graph_traits.hpp b/include/graph/container/traits/dol_graph_traits.hpp
@@ -7,10 +7,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/dov_graph_traits.hpp b/include/graph/container/traits/dov_graph_traits.hpp
@@ -7,10 +7,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/mod_graph_traits.hpp b/include/graph/container/traits/mod_graph_traits.hpp
@@ -8,10 +8,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/mofl_graph_traits.hpp b/include/graph/container/traits/mofl_graph_traits.hpp
@@ -8,10 +8,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/mol_graph_traits.hpp b/include/graph/container/traits/mol_graph_traits.hpp
@@ -8,10 +8,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/mov_graph_traits.hpp b/include/graph/container/traits/mov_graph_traits.hpp
@@ -8,10 +8,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/uod_graph_traits.hpp b/include/graph/container/traits/uod_graph_traits.hpp
@@ -8,10 +8,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/uofl_graph_traits.hpp b/include/graph/container/traits/uofl_graph_traits.hpp
@@ -8,10 +8,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/uol_graph_traits.hpp b/include/graph/container/traits/uol_graph_traits.hpp
@@ -8,10 +8,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/uov_graph_traits.hpp b/include/graph/container/traits/uov_graph_traits.hpp
@@ -8,10 +8,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/vod_graph_traits.hpp b/include/graph/container/traits/vod_graph_traits.hpp
@@ -7,10 +7,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/vofl_graph_traits.hpp b/include/graph/container/traits/vofl_graph_traits.hpp
@@ -7,10 +7,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/vol_graph_traits.hpp b/include/graph/container/traits/vol_graph_traits.hpp
@@ -7,10 +7,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/include/graph/container/traits/vov_graph_traits.hpp b/include/graph/container/traits/vov_graph_traits.hpp
@@ -6,10 +6,10 @@ namespace graph::container {
 
 // Forward declarations
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_edge;
+class dynamic_edge;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
-struct dynamic_vertex;
+class dynamic_vertex;
 
 template <class EV, class VV, class GV, class VId, bool Sourced, class Traits>
 class dynamic_graph;
diff --git a/tests/test_dynamic_graph_cpo_dos.cpp b/tests/test_dynamic_graph_cpo_dos.cpp
@@ -1192,7 +1192,7 @@ TEST_CASE("dos CPO integration", "[dynamic_graph][dos][cpo][integration]") {
         visited[start] = true;
         order.push_back(start);
         
-        std::vector<uint32_t> queue = {start};
+        std::vector<uint32_t> queue = {static_cast<uint32_t>(start)};
         while (!queue.empty()) {
             auto uid = queue.front();
             queue.erase(queue.begin());
diff --git a/tests/test_dynamic_graph_cpo_dous.cpp b/tests/test_dynamic_graph_cpo_dous.cpp
@@ -1198,7 +1198,7 @@ TEST_CASE("vos CPO integration", "[dynamic_graph][dous][cpo][integration]") {
         visited[start] = true;
         order.push_back(start);
         
-        std::deque<uint32_t> queue = {start};
+        std::deque<uint32_t> queue = {static_cast<uint32_t>(start)};
         while (!queue.empty()) {
             auto uid = queue.front();
             queue.erase(queue.begin());
diff --git a/tests/test_dynamic_graph_cpo_voem.cpp b/tests/test_dynamic_graph_cpo_voem.cpp
@@ -1192,7 +1192,7 @@ TEST_CASE("voem CPO integration", "[dynamic_graph][voem][cpo][integration]") {
         visited[start] = true;
         order.push_back(start);
         
-        std::vector<uint32_t> queue = {start};
+        std::vector<uint32_t> queue = {static_cast<uint32_t>(start)};
         while (!queue.empty()) {
             auto uid = queue.front();
             queue.erase(queue.begin());
diff --git a/tests/test_dynamic_graph_cpo_vos.cpp b/tests/test_dynamic_graph_cpo_vos.cpp
@@ -1191,7 +1191,7 @@ TEST_CASE("vos CPO integration", "[dynamic_graph][vos][cpo][integration]") {
         visited[start] = true;
         order.push_back(start);
         
-        std::vector<uint32_t> queue = {start};
+        std::vector<uint32_t> queue = {static_cast<uint32_t>(start)};
         while (!queue.empty()) {
             auto uid = queue.front();
             queue.erase(queue.begin());
diff --git a/tests/test_dynamic_graph_cpo_vous.cpp b/tests/test_dynamic_graph_cpo_vous.cpp
@@ -1198,7 +1198,7 @@ TEST_CASE("vos CPO integration", "[dynamic_graph][vous][cpo][integration]") {
         visited[start] = true;
         order.push_back(start);
         
-        std::vector<uint32_t> queue = {start};
+        std::vector<uint32_t> queue = {static_cast<uint32_t>(start)};
         while (!queue.empty()) {
             auto uid = queue.front();
             queue.erase(queue.begin());
diff --git a/tests/test_dynamic_graph_mous.cpp b/tests/test_dynamic_graph_mous.cpp
@@ -130,9 +130,8 @@ TEST_CASE("mous iterator categories", "[dynamic_graph][mous][iterators]") {
         using traits = mous_graph_traits<void, void, void, uint32_t, false>;
         using edges_t = typename traits::edges_type;
         using edge_iter_t = typename edges_t::iterator;
-        // unordered_set iterators are forward only (not bidirectional)
+        // unordered_set iterators are at least forward (bidirectional in MSVC, forward-only in GCC)
         static_assert(std::forward_iterator<edge_iter_t>);
-        static_assert(!std::bidirectional_iterator<edge_iter_t>);
         // and NOT random access
         static_assert(!std::random_access_iterator<edge_iter_t>);
         REQUIRE(true);
diff --git a/tests/test_dynamic_graph_uod.cpp b/tests/test_dynamic_graph_uod.cpp
@@ -113,11 +113,10 @@ TEST_CASE("uod traits verification", "[dynamic_graph][uod][traits]") {
 
 TEST_CASE("uod iterator categories", "[dynamic_graph][uod][iterators]") {
     SECTION("underlying unordered_map iterators are forward") {
-        // Note: unordered_map iterators are forward iterators
+        // Note: unordered_map iterators are at least forward iterators (bidirectional in MSVC, forward-only in GCC)
         using G = uod_void_void_void;
         using iter_t = typename G::vertices_type::iterator;
         static_assert(std::forward_iterator<iter_t>);
-        static_assert(!std::bidirectional_iterator<iter_t>);
         REQUIRE(true);
     }
 
diff --git a/tests/test_dynamic_graph_uofl.cpp b/tests/test_dynamic_graph_uofl.cpp
@@ -113,11 +113,10 @@ TEST_CASE("uofl traits verification", "[dynamic_graph][uofl][traits]") {
 
 TEST_CASE("uofl iterator categories", "[dynamic_graph][uofl][iterators]") {
     SECTION("underlying unordered_map iterators are forward") {
-        // Note: unordered_map iterators are forward iterators
+        // Note: unordered_map iterators are at least forward iterators (bidirectional in MSVC, forward-only in GCC)
         using G = uofl_void_void_void;
         using iter_t = typename G::vertices_type::iterator;
         static_assert(std::forward_iterator<iter_t>);
-        static_assert(!std::bidirectional_iterator<iter_t>);
         REQUIRE(true);
     }
 
diff --git a/tests/test_dynamic_graph_uol.cpp b/tests/test_dynamic_graph_uol.cpp
@@ -113,11 +113,10 @@ TEST_CASE("uol traits verification", "[dynamic_graph][uol][traits]") {
 
 TEST_CASE("uol iterator categories", "[dynamic_graph][uol][iterators]") {
     SECTION("underlying unordered_map iterators are forward") {
-        // Note: unordered_map iterators are forward iterators
+        // Note: unordered_map iterators are at least forward iterators (bidirectional in MSVC, forward-only in GCC)
         using G = uol_void_void_void;
         using iter_t = typename G::vertices_type::iterator;
         static_assert(std::forward_iterator<iter_t>);
-        static_assert(!std::bidirectional_iterator<iter_t>);
         REQUIRE(true);
     }
 
diff --git a/tests/test_dynamic_graph_uous.cpp b/tests/test_dynamic_graph_uous.cpp
@@ -121,9 +121,8 @@ TEST_CASE("uous iterator categories", "[dynamic_graph][uous][iterators]") {
     SECTION("underlying unordered_map iterators are forward only") {
         using G = uous_void_void_void;
         using iter_t = typename G::vertices_type::iterator;
-        // unordered_map iterators are forward only (not bidirectional)
+        // unordered_map iterators are at least forward (bidirectional in MSVC, forward-only in GCC)
         static_assert(std::forward_iterator<iter_t>);
-        static_assert(!std::bidirectional_iterator<iter_t>);
         static_assert(!std::random_access_iterator<iter_t>);
         REQUIRE(true);
     }
@@ -132,9 +131,8 @@ TEST_CASE("uous iterator categories", "[dynamic_graph][uous][iterators]") {
         using traits = uous_graph_traits<void, void, void, uint32_t, false>;
         using edges_t = typename traits::edges_type;
         using edge_iter_t = typename edges_t::iterator;
-        // unordered_set iterators are forward only (not bidirectional)
+        // unordered_set iterators are at least forward (bidirectional in MSVC, forward-only in GCC)
         static_assert(std::forward_iterator<edge_iter_t>);
-        static_assert(!std::bidirectional_iterator<edge_iter_t>);
         // and NOT random access
         static_assert(!std::random_access_iterator<edge_iter_t>);
         REQUIRE(true);
diff --git a/tests/test_dynamic_graph_uov.cpp b/tests/test_dynamic_graph_uov.cpp
@@ -113,11 +113,10 @@ TEST_CASE("uov traits verification", "[dynamic_graph][uov][traits]") {
 
 TEST_CASE("uov iterator categories", "[dynamic_graph][uov][iterators]") {
     SECTION("underlying unordered_map iterators are forward") {
-        // Note: unordered_map iterators are forward iterators
+        // Note: unordered_map iterators are at least forward iterators (bidirectional in MSVC, forward-only in GCC)
         using G = uov_void_void_void;
         using iter_t = typename G::vertices_type::iterator;
         static_assert(std::forward_iterator<iter_t>);
-        static_assert(!std::bidirectional_iterator<iter_t>);
         REQUIRE(true);
     }
 
