coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-10-28 18:07:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/ETLCPP/etl into development

Browse Source 
# Conflicts:
#	test/test_delegate_observable.cpp
This commit is contained in:
John Wellbelove 2025-08-13 08:53:26 +01:00
commit f973d31ad1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/test_delegate_observable.cpp
View File

@ -98,14 +98,15 @@ namespace
#if defined(ETL_COMPILER_GCC)
#if (ETL_COMPILER_FULL_VERSION <= 1100)
#define ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE 0
#define ETL_GCC_11 1
#else
#define ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE 1
#define ETL_GCC_11 0
#endif
#else
#define ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE 1
#define ETL_GCC_11 0
#endif
#define ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE (ETL_GCC_11 && ETL_USING_CPP14)
#if ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE
//*************************************************************************