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

Merge branch 'hotfix/fix_nodiscard' into development

Browse Source
This commit is contained in:
John Wellbelove 2019-12-18 10:11:15 +00:00
commit 4dc2d56c4c
6 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/etl/platform.h
View File

@ -75,32 +75,24 @@ SOFTWARE.
#if ETL_CPP11_SUPPORTED
#define ETL_CONSTEXPR constexpr
#define ETL_CONST constexpr
#define ETL_DELETE = delete
#define ETL_NOEXCEPT noexcept
#define ETL_NOEXCEPT_EXPR(expression) noexcept(expression)
#else
#define ETL_CONSTEXPR
#define ETL_CONST const
#define ETL_DELETE
#define ETL_NOEXCEPT
#define ETL_NOEXCEPT_EXPR(expression)
#endif
#if ETL_CPP17_SUPPORTED
#define ETL_CONSTEXPR17 constexpr
#define ETL_IF_CONSTEXPR constexpr
#define ETL_NODISCARD [[nodiscard]]
#else
#define ETL_CONSTEXPR17
#define ETL_IF_CONSTEXPR
#endif
#if ETL_CPP11_SUPPORTED
#define ETL_DELETE = delete
#else
#define ETL_DELETE
#endif
#if ETL_CPP11_SUPPORTED
#define ETL_NOEXCEPT noexcept
#define ETL_NOEXCEPT_EXPR(expression) noexcept(expression)
#define ETL_NODISCARD [[nodiscard]]
#else
#define ETL_NOEXCEPT
#define ETL_NOEXCEPT_EXPR(expression)
#define ETL_NODISCARD
#endif
@ -110,10 +102,4 @@ SOFTWARE.
#define ETL_EXPLICIT_STRING_FROM_CHAR
#endif
#if defined(ETL_FORCE_EXPLICIT_STRING_CONVERSION_FROM_CHAR)
#define ETL_EXPLICIT_STRING_FROM_CHAR explicit
#else
#define ETL_EXPLICIT_STRING_FROM_CHAR
#endif
#endif

2
include/etl/version.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 15
#define ETL_VERSION_MINOR 4
#define ETL_VERSION_PATCH 0
#define ETL_VERSION_PATCH 1
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH)

2
library.json
View File

@ -1,6 +1,6 @@
{
"name": "Embedded Template Library",
"version": "15.4.0",
"version": "15.4.1",
"authors": {
"name": "John Wellbelove",
"email": "<john.wellbelove@etlcpp.com>"

2
library.properties
View File

@ -1,5 +1,5 @@
name=Embedded Template Library
version=15.4.0
version=15.4.1
author= John Wellbelove <john.wellbelove@etlcpp.com>
maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
license=MIT

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
15.4.1
Move ETL_NODISCARD definition to ETL_CPP17_SUPPORTED test
===============================================================================
15.4.0
Refactored CRC classes for better code sharing and reduced resource requirements

3
test/vs2017/etl.vcxproj.filters
View File

@ -1352,6 +1352,9 @@
<None Include="..\..\library.json">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\.circleci\config.yml">
<Filter>Resource Files\CI\CircleCI</Filter>
</None>
<None Include="..\..\README.md">
<Filter>Resource Files</Filter>
</None>