fix: fix namespace name in ScopeGuard

This commit is contained in:
Stanislav Angelovic
2023-01-21 01:34:34 +01:00
parent f332f46087
commit 3a56113422

View File

@@ -55,18 +55,17 @@
// return; // exiting scope normally // return; // exiting scope normally
// } // }
#define SCOPE_EXIT \ #define SCOPE_EXIT \
auto ANONYMOUS_VARIABLE(SCOPE_EXIT_STATE) \ auto ANONYMOUS_VARIABLE(SCOPE_EXIT_STATE) \
= ::skybase::utils::detail::ScopeGuardOnExit() + [&]() \ = ::sdbus::internal::detail::ScopeGuardOnExit() + [&]() \
/**/ /**/
#define SCOPE_EXIT_NAMED(NAME) \ #define SCOPE_EXIT_NAMED(NAME) \
auto NAME \ auto NAME \
= ::skybase::utils::detail::ScopeGuardOnExit() + [&]() \ = ::sdbus::internal::detail::ScopeGuardOnExit() + [&]() \
/**/ /**/
namespace skybase { namespace sdbus::internal {
namespace utils {
template <class _Fun> template <class _Fun>
class ScopeGuard class ScopeGuard
@@ -114,7 +113,7 @@ namespace utils {
} }
} }
}} }
#define CONCATENATE_IMPL(s1, s2) s1##s2 #define CONCATENATE_IMPL(s1, s2) s1##s2
#define CONCATENATE(s1, s2) CONCATENATE_IMPL(s1, s2) #define CONCATENATE(s1, s2) CONCATENATE_IMPL(s1, s2)