From b0f5a99e15a1bee683d5baec2e88ba3a26df2e75 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 18 Mar 2022 15:09:26 +0000 Subject: [PATCH] Added macros for namespace identification --- include/etl/private/choose_namespace.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/etl/private/choose_namespace.h b/include/etl/private/choose_namespace.h index 810fa9e1..f36a2837 100644 --- a/include/etl/private/choose_namespace.h +++ b/include/etl/private/choose_namespace.h @@ -37,17 +37,25 @@ SOFTWARE. #if ETL_NOT_USING_STL && !defined(ETL_IN_UNIT_TEST) // If we're not using the STL and we are not unit testing, then use the ETL's definitions under the etl namespace #define ETL_OR_STD etl + #define ETL_USING_STD_NAMESPACE 0 + #define ETL_USING_ETL_NAMESPACE 1 #else // We will use the STL's definitions under the std namespace #define ETL_OR_STD std + #define ETL_USING_STD_NAMESPACE 1 + #define ETL_USING_ETL_NAMESPACE 0 #endif #if (ETL_NOT_USING_STL && !defined(ETL_IN_UNIT_TEST)) || ETL_CPP11_NOT_SUPPORTED // If we're not using the STL and we are not unit testing or C++11 is not supported, then use the ETL's definitions under the etl namespace -#define ETL_OR_STD11 etl + #define ETL_OR_STD11 etl + #define ETL_USING_STD11_NAMESPACE 0 + #define ETL_USING_ETL11_NAMESPACE 1 #else // We will use the STL's definitions under the std namespace #define ETL_OR_STD11 std + #define ETL_USING_STD11_NAMESPACE 1 + #define ETL_USING_ETL11_NAMESPACE 0 #endif #endif