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 2016-02-15 21:26:43 +00:00
commit 5fc6ed50ba
7 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iflat_map.h
View File

@ -409,7 +409,7 @@ namespace etl
if (itr != end())
{
if (itr->first == key)
if (!key_compare()(itr->first, key) && !key_compare()(key, itr->first))
{
return itr;
}
@ -433,7 +433,7 @@ namespace etl
if (itr != end())
{
if (itr->first == key)
if (!key_compare()(itr->first, key) && !key_compare()(key, itr->first))
{
return itr;
}

4
iflat_multimap.h
View File

@ -354,7 +354,7 @@ namespace etl
if (itr != end())
{
if (itr->first == key)
if (!key_compare()(itr->first, key) && !key_compare()(key, itr->first))
{
return itr;
}
@ -378,7 +378,7 @@ namespace etl
if (itr != end())
{
if (itr->first == key)
if (!key_compare()(itr->first, key) && !key_compare()(key, itr->first))
{
return itr;
}

12
iflat_multiset.h
View File

@ -331,13 +331,13 @@ namespace etl
if (itr != end())
{
if (*itr != key)
if (!key_compare()(*itr, key) && !key_compare()(key, *itr))
{
return end();
return itr;
}
else
{
return itr;
return end();
}
}
@ -355,13 +355,13 @@ namespace etl
if (itr != end())
{
if (*itr != key)
if (!key_compare()(*itr, key) && !key_compare()(key, *itr))
{
return end();
return itr;
}
else
{
return itr;
return end();
}
}

4
iflat_set.h
View File

@ -338,7 +338,7 @@ namespace etl
if (itr != end())
{
if (*itr == key)
if (!key_compare()(*itr, key) && !key_compare()(key, *itr))
{
return itr;
}
@ -362,7 +362,7 @@ namespace etl
if (itr != end())
{
if (*itr == key)
if (!key_compare()(*itr, key) && !key_compare()(key, *itr))
{
return itr;
}

2
intrusive_links.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#include "error_handler.h"
#undef ETL_FILE
#define ETL_FILE "21"
#define ETL_FILE "22"
//*****************************************************************************
// Note:

6
iunordered_map.h
View File

@ -480,7 +480,7 @@ namespace etl
//*********************************************************************
iterator begin()
{
return iterator(pbuckets->end(), first, last->begin());
return iterator(pbuckets->end(), first, first->begin());
}
//*********************************************************************
@ -489,7 +489,7 @@ namespace etl
//*********************************************************************
const_iterator begin() const
{
return const_iterator(pbuckets->end(), first, last->begin());
return const_iterator(pbuckets->end(), first, first->begin());
}
//*********************************************************************
@ -498,7 +498,7 @@ namespace etl
//*********************************************************************
const_iterator cbegin() const
{
return const_iterator(pbuckets->end(), first, last->begin());
return const_iterator(pbuckets->end(), first, first->begin());
}
//*********************************************************************

6
test/test_map.cpp
View File

@ -807,6 +807,9 @@ namespace
it = data.find("A");
CHECK_EQUAL(data.end(), it);
it = data.find("!");
CHECK_EQUAL(data.end(), it);
}
//*************************************************************************
@ -819,6 +822,9 @@ namespace
it = data.find("A");
CHECK_EQUAL(data.end(), it);
it = data.find("!");
CHECK_EQUAL(data.end(), it);
}
//*************************************************************************