Merge pull request #499 from biojppm/fix/470_wundef

biojppm · Feb 14, 2025 · 03fdd42 · 03fdd42
2 parents ad4ff9d + 5db61e2
commit 03fdd42
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/changelog/current.md b/changelog/current.md
@@ -29,6 +29,7 @@
 - [PR#485](https://github.com/biojppm/rapidyaml/pull/485): improve the CI workflows (thanks to @ingydotnet):
   - amazing code reuse and organization, thanks to the use of YamlScript to generate the final workflows
   - all optimization levels are now covered for gcc, clang and Visual Studio.
+- [PR#499](https://github.com/biojppm/rapidyaml/pull/499): fix warnings with `-Wundef`.
 
 
 ## Thanks

diff --git a/ext/c4core b/ext/c4core
diff --git a/src/c4/yml/event_handler_tree.hpp b/src/c4/yml/event_handler_tree.hpp
@@ -47,7 +47,7 @@ struct EventHandlerTree : public EventHandlerStack<EventHandlerTree, EventHandle
     size_t m_num_directives;
     bool m_yaml_directive;
 
-    #if RYML_DBG
+    #ifdef RYML_DBG
     #define _enable_(bits) _enable__<bits>(); _c4dbgpf("node[{}]: enable {}", m_curr->node_id, #bits)
     #define _disable_(bits) _disable__<bits>(); _c4dbgpf("node[{}]: disable {}", m_curr->node_id, #bits)
     #else

diff --git a/test/test_suite/test_suite_common.hpp b/test/test_suite/test_suite_common.hpp
@@ -16,7 +16,11 @@
 #include "test_lib/test_case.hpp"
 #include <gtest/gtest.h>
 
-#define RYML_NFO (0 || RYML_DBG)
+#if (0 || defined(RYML_DBG))
+#define RYML_NFO (1)
+#else
+#define RYML_NFO (0)
+#endif
 
 #if RYML_NFO
 #define _nfo_print_tree(title, tree) do { c4::log("{}:{}: " title ":", __FILE__, __LINE__); print_tree(tree); c4::yml::emit_yaml(tree, stdout); fflush(stdout); } while(0)
+10 −20		.github/docker/ubuntu24.04/c4core-install
+2 −2		bm/bm_charconv.cpp
+16 −16		bm/float/read.cpp
+1 −0		changelog/current.md
+1 −1		cmake
+18 −28		src/c4/charconv.hpp
+4 −0		src/c4/error.hpp
+1 −1		src/c4/ext/debugbreak
+1 −1		src/c4/ext/fast_float
+5 −0		src/c4/ext/fast_float.hpp
+3 −2		src/c4/ext/fast_float_all.h
+1 −1		src/c4/format.hpp
+4 −4		test/test_charconv.cpp