Nest microfmt in the cpptrace namespace due to conditionally-enabled C++17 behavior causing ODR issues, related to jeremy-rifkin/libassert#103

jeremy-rifkin · jeremy-rifkin · commit 4e9f0da95fa9 · 2024-09-12T21:06:12.000-05:00
diff --git a/src/utils/microfmt.hpp b/src/utils/microfmt.hpp
@@ -17,6 +17,7 @@
 // https://github.com/jeremy-rifkin/microfmt
 // Format: {[align][width][:[fill][base]]}  # width: number or {}
 
+namespace cpptrace {
 namespace microfmt {
     namespace detail {
         inline std::uint64_t clz(std::uint64_t value) {
@@ -301,5 +302,6 @@ namespace microfmt {
         fwrite(str.data(), 1, str.size(), stream);
     }
 }
+}
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`// https://github.com/jeremy-rifkin/microfmt`
`18`	`18`	`// Format: {[align][width][:[fill][base]]} # width: number or {}`
`19`	`19`
	`20`	`+namespace cpptrace {`
`20`	`21`	`namespace microfmt {`
`21`	`22`	`namespace detail {`
`22`	`23`	`inline std::uint64_t clz(std::uint64_t value) {`
`@@ -301,5 +302,6 @@ namespace microfmt {`
`301`	`302`	`fwrite(str.data(), 1, str.size(), stream);`
`302`	`303`	`}`
`303`	`304`	`}`
	`305`	`+}`
`304`	`306`
`305`	`307`	`#endif`