Util: Move json/conversion.h -> meta/odr.h

2022-07-21 01:50:15 +02:00
parent 2408be335d
commit dd209a2609
4 changed files with 27 additions and 26 deletions
@@ -17,8 +17,8 @@
 #include <vector>

 #include "util/json/array.h"
-#include "util/json/conversion.h"
 #include "util/json/object.h"
+#include "util/meta/odr.h"

 namespace Json {

@@ -113,7 +113,7 @@ struct fromJsonFunction {
 // Anonymous namespace prevents multiple definition of the reference
 namespace {
 // Function object
-constexpr const auto& fromJson = Detail::staticConst<Detail::fromJsonFunction>; // NOLINT (misc-definitions-in-headers)
+constexpr const auto& fromJson = Util::Detail::staticConst<Detail::fromJsonFunction>; // NOLINT(misc-definitions-in-headers,clang-diagnostic-unused-variable)
 } // namespace

 } // namespace Json