Skip to content

Commit

Permalink
bugfix missing common namespace prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
silverqx committed Nov 13, 2022
1 parent c593226 commit 97c24cf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion include/orm/macros/logexecutedquery.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions include/orm/utils/type.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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__ \
Expand All @@ -29,8 +31,6 @@ TINY_SYSTEM_HEADER
# define __tiny_func__ QString {__FUNCTION__}
#endif

TINYORM_BEGIN_COMMON_NAMESPACE

namespace Orm::Utils
{

Expand Down

0 comments on commit 97c24cf

Please sign in to comment.