From 97c24cfd890ca684c034461488e999e4f8eaeead Mon Sep 17 00:00:00 2001 From: silverqx Date: Sun, 13 Nov 2022 08:53:45 +0100 Subject: [PATCH] bugfix missing common namespace prefix --- include/orm/macros/logexecutedquery.hpp | 8 +++++++- include/orm/utils/type.hpp | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/orm/macros/logexecutedquery.hpp b/include/orm/macros/logexecutedquery.hpp index f51308392..b08b06d5c 100644 --- a/include/orm/macros/logexecutedquery.hpp +++ b/include/orm/macros/logexecutedquery.hpp @@ -7,16 +7,22 @@ TINY_SYSTEM_HEADER #include "orm/config.hpp" +#include "orm/macros/commonnamespace.hpp" + #if !defined(LOG_EXECUTED_QUERY) && !defined(TINYORM_NO_DEBUG) # include "orm/utils/query.hpp" #endif +TINYORM_BEGIN_COMMON_NAMESPACE + #ifndef LOG_EXECUTED_QUERY -# if !defined(TINYORM_NO_DEBUG) +# ifndef TINYORM_NO_DEBUG # define LOG_EXECUTED_QUERY(query) Orm::Utils::Query::logExecutedQuery(query) # else # define LOG_EXECUTED_QUERY(query) qt_noop() # endif #endif +TINYORM_END_COMMON_NAMESPACE + #endif // ORM_MACROS_LOGEXECUTEDQUERY_HPP diff --git a/include/orm/utils/type.hpp b/include/orm/utils/type.hpp index 200bb9396..092b70835 100644 --- a/include/orm/utils/type.hpp +++ b/include/orm/utils/type.hpp @@ -17,6 +17,8 @@ TINY_SYSTEM_HEADER #include "orm/macros/commonnamespace.hpp" #include "orm/macros/export.hpp" +TINYORM_BEGIN_COMMON_NAMESPACE + #if defined(__GNUG__) || defined(__clang__) // NOLINTNEXTLINE(bugprone-reserved-identifier) # define __tiny_func__ \ @@ -29,8 +31,6 @@ TINY_SYSTEM_HEADER # define __tiny_func__ QString {__FUNCTION__} #endif -TINYORM_BEGIN_COMMON_NAMESPACE - namespace Orm::Utils {