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

Merge remote-tracking branch 'origin/development'

Browse Source 
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
This commit is contained in:
John Wellbelove 2018-07-28 14:06:01 +01:00
commit 75ecb0b411
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/etl/reference_flat_map.h
View File

@ -835,7 +835,7 @@ namespace etl
result.first = i_element;
// Existing element?
if (value.first != i_element->first)
if (TKeyCompare()(value.first, i_element->first) || TKeyCompare()(i_element->first, value.first))
{
// A new one.
ETL_ASSERT(!lookup.full(), ETL_ERROR(flat_map_full));

2
include/etl/reference_flat_set.h
View File

@ -745,7 +745,7 @@ namespace etl
result.first = i_element;
// Existing element?
if (value != *i_element)
if (TKeyCompare()(value, *i_element) || TKeyCompare()(*i_element, value))
{
// A new one.
ETL_ASSERT(!lookup.full(), ETL_ERROR(flat_set_full));

10
include/etl/version.h
View File

@ -37,13 +37,13 @@ SOFTWARE.
/// Definitions of the ETL version
///\ingroup utilities
#define ETL_VERSION "11.14.1"
#define ETL_VERSION_W L"11.14.1"
#define ETL_VERSION_U16 u"11.14.1"
#define ETL_VERSION_U32 U"11.14.1"
#define ETL_VERSION "11.14.2"
#define ETL_VERSION_W L"11.14.2"
#define ETL_VERSION_U16 u"11.14.2"
#define ETL_VERSION_U32 U"11.14.2"
#define ETL_VERSION_MAJOR 11
#define ETL_VERSION_MINOR 14
#define ETL_VERSION_PATCH 1
#define ETL_VERSION_PATCH 2
#define ETL_VERSION_VALUE ((ETL_VERSION_MAJOR * 10000) + (ETL_VERSION_MINOR * 100) + ETL_VERSION_PATCH)
#endif

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
11.14.2
Removed reference_flat_set & reference_flat_map reliance on equality.
===============================================================================
11.14.1
Removed flat_set & flat_map reliance on equality.