coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-29 22:08:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
This commit is contained in:
EXPROGROUP\john.wellbelove 2018-05-10 15:27:32 +01:00
commit 1c3ac08b78
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/etl/debug_count.h
View File

@ -133,5 +133,14 @@ namespace etl
#endif // ETL_DEBUG_COUNT
}
#else
#define ETL_DECLARE_DEBUG_COUNT
#define ETL_INCREMENT_DEBUG_COUNT
#define ETL_DECREMENT_DEBUG_COUNT
#define ETL_ADD_DEBUG_COUNT(n)
#define ETL_SUBTRACT_DEBUG_COUNT(n)
#define ETL_RESET_DEBUG_COUNT
#endif // ETL_DEBUG_COUNT
#endif

4
include/etl/version.h
View File

@ -37,10 +37,10 @@ SOFTWARE.
/// Definitions of the ETL version
///\ingroup utilities
#define ETL_VERSION "11.9.1"
#define ETL_VERSION "11.9.2"
#define ETL_VERSION_MAJOR 11
#define ETL_VERSION_MINOR 9
#define ETL_VERSION_PATCH 1
#define ETL_VERSION_PATCH 2
#endif

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
11.9.2
Fixed compile error when ETL_DEBUG_COUNT is not defined.
===============================================================================
11.9.1
Fix Github issue #73 (Timers)