coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 14:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/hot-fix/ETL_FILE' into development

Browse Source
This commit is contained in:
John Wellbelove 2019-02-18 19:33:58 +01:00
commit 5243b96d0b
10 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/etl/basic_string.h
View File

@ -51,6 +51,7 @@ SOFTWARE.
#include "integral_limits.h"
#include "exception.h"
#undef ETL_FILE
#define ETL_FILE "27"
#ifdef ETL_COMPILER_GCC

1
include/etl/intrusive_queue.h
View File

@ -38,6 +38,7 @@ SOFTWARE.
#include "error_handler.h"
#include "intrusive_links.h"
#undef ETL_FILE
#define ETL_FILE "29"
namespace etl

1
include/etl/intrusive_stack.h
View File

@ -38,6 +38,7 @@ SOFTWARE.
#include "error_handler.h"
#include "intrusive_links.h"
#undef ETL_FILE
#define ETL_FILE "28"
namespace etl

1
include/etl/private/vector_base.h
View File

@ -42,6 +42,7 @@ SOFTWARE.
#include "../error_handler.h"
#include "../debug_count.h"
#undef ETL_FILE
#define ETL_FILE "17"
namespace etl

2
include/etl/queue_mpmc_mutex.h
View File

@ -584,4 +584,6 @@ namespace etl
};
}
#undef ETL_FILE
#endif

2
include/etl/queue_spsc_atomic.h
View File

@ -471,4 +471,6 @@ namespace etl
};
}
#undef ETL_FILE
#endif

2
include/etl/queue_spsc_isr.h
View File

@ -678,4 +678,6 @@ namespace etl
};
}
#undef ETL_FILE
#endif

1
include/etl/stack.h
View File

@ -48,6 +48,7 @@ SOFTWARE.
#include "parameter_type.h"
#include "type_traits.h"
#undef ETL_FILE
#define ETL_FILE "15"
//*****************************************************************************

2
include/etl/version.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 11
#define ETL_VERSION_PATCH 1
#define ETL_VERSION_PATCH 2
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_WIDE_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
14.11.2
Fix inconsistent ETL_FILE definitions.
===============================================================================
14.11.1
Fix 'force C++03' macros leftover from testing.