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

Merge branch 'hotfix/unordered_map_iterator_return_type' into development

Browse Source
This commit is contained in:
John Wellbelove 2019-09-16 16:00:05 +01:00
commit 8bda4d761a
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/etl/unordered_map.h
View File

@ -244,7 +244,7 @@ namespace etl
}
//*********************************
std::pair<const TKey, T> operator *()
reference operator *()
{
return inode->key_value_pair;
}

2
include/etl/unordered_multimap.h
View File

@ -243,7 +243,7 @@ namespace etl
}
//*********************************
std::pair<const TKey, T> operator *()
reference operator *()
{
return inode->key_value_pair;
}

2
include/etl/version.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 29
#define ETL_VERSION_PATCH 3
#define ETL_VERSION_PATCH 4
#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.29.4
Fixed unordered_map iterator operator* return type
===============================================================================
14.29.3
Minor updatess for etl::delegate