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
This commit is contained in:
John Wellbelove 2018-07-28 09:30:44 +01:00
parent 36f19e5423
commit 8a009b6d4d
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/flat_map.h
View File

@ -300,7 +300,7 @@ namespace etl
std::pair<iterator, bool> result(i_element, false);
// Doesn't already exist?
if ((i_element == end() || (i_element->first != value.first)))
if ((i_element == end()) || TKeyCompare()(i_element->first, value.first) || TKeyCompare()(value.first, i_element->first))
{
ETL_ASSERT(!refmap_t::full(), ETL_ERROR(flat_map_full));

2
include/etl/flat_set.h
View File

@ -233,7 +233,7 @@ namespace etl
std::pair<iterator, bool> result(i_element, false);
// Doesn't already exist?
if ((i_element == end() || (*i_element != value)))
if ((i_element == end()) || TKeyCompare()(*i_element, value) || TKeyCompare()(value, *i_element))
{
ETL_ASSERT(!refset_t::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.0"
#define ETL_VERSION_W L"11.14.0"
#define ETL_VERSION_U16 u"11.14.0"
#define ETL_VERSION_U32 U"11.14.0"
#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_MAJOR 11
#define ETL_VERSION_MINOR 14
#define ETL_VERSION_PATCH 0
#define ETL_VERSION_PATCH 1
#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.1
Removed flat_set & flat_map reliance on equality.
===============================================================================
11.14.0
Added tests for limited support for self insert for strings.