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

Fix etl::pair error and warning

Browse Source
This commit is contained in:
John Wellbelove 2020-02-18 10:45:09 +01:00
parent e6617dc7e7
commit 5cdcc8d4c6
14 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/etl/algorithm.h
View File

@ -2048,6 +2048,7 @@ namespace etl
return std::is_permutation(begin1, end1, begin2, predicate);
}
#if ETL_CPP14_SUPPORTED
//***************************************************************************
/// is_permutation
///\ingroup algorithm
@ -2078,6 +2079,7 @@ namespace etl
{
return std::is_permutation(begin1, end1, begin2, end2, predicate);
}
#endif
#endif
#if defined(ETL_NO_STL) || !ETL_CPP11_SUPPORTED

1
include/etl/flat_multimap.h
View File

@ -36,6 +36,7 @@ SOFTWARE.
#include "platform.h"
#include "reference_flat_multimap.h"
#include "pool.h"
#include "utility.h"
#if ETL_CPP11_SUPPORTED && !defined(ETL_STLPORT) && !defined(ETL_NO_STL)
#include <initializer_list>

2
include/etl/indirect_vector.h
View File

@ -35,7 +35,7 @@ SOFTWARE.
#include "vector.h"
#include "pool.h"
#include "iterator.h"
#include "iterator.h"
#include "utility.h"
#include "functional.h"
#if ETL_CPP11_SUPPORTED && !defined(ETL_STLPORT) && !defined(ETL_NO_STL)

2
include/etl/memory.h
View File

@ -34,8 +34,8 @@ SOFTWARE.
#include "platform.h"
#include "algorithm.h"
#include "type_traits.h"
#include "iterator.h"
#include "utility.h"
#include <assert.h>

2
include/etl/pool.h
View File

@ -37,7 +37,7 @@ SOFTWARE.
#include "algorithm.h"
#include "iterator.h"
#include "utility.h"
#include "error_handler.h"
#include "alignment.h"
#include "array.h"

2
include/etl/priority_queue.h
View File

@ -36,8 +36,8 @@ SOFTWARE.
#include "platform.h"
#include "algorithm.h"
#include "utility.h"
#include "functional.h"
#include "container.h"
#include "vector.h"
#include "type_traits.h"

3
include/etl/stack.h
View File

@ -37,9 +37,8 @@ SOFTWARE.
#include <new>
#include "platform.h"
#include "algorithm.h"
#include "utility.h"
#include "container.h"
#include "alignment.h"
#include "array.h"

8
include/etl/utility.h
View File

@ -132,7 +132,7 @@ namespace etl
swap(second, other.second);
}
pair& operator =(const pair<T1, T2>& other)
pair<T1, T2>& operator =(const pair<T1, T2>& other)
{
first = other.first;
second = other.second;
@ -141,7 +141,7 @@ namespace etl
}
template <typename U1, typename U2>
pair& operator =(const pair<U1, U2>& other)
pair<U1, U2>& operator =(const pair<U1, U2>& other)
{
first = other.first;
second = other.second;
@ -150,7 +150,7 @@ namespace etl
}
#if ETL_CPP11_SUPPORTED
pair& operator =(pair<T1, T2>&& other)
pair<T1, T2>& operator =(pair<T1, T2>&& other)
{
first = etl::move(other.first);
second = etl::move(other.second);
@ -159,7 +159,7 @@ namespace etl
}
template <typename U1, typename U2>
pair& operator =(pair<U1, U2>&& other)
pair<U1, U2>& operator =(pair<U1, U2>&& other)
{
first = etl::move(other.first);
second = etl::move(other.second);

1
include/etl/variant.h
View File

@ -36,6 +36,7 @@ SOFTWARE.
#include <new>
#include "platform.h"
#include "utility.h"
#include "array.h"
#include "largest.h"
#include "exception.h"

2
include/etl/version.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 16
#define ETL_VERSION_MINOR 4
#define ETL_VERSION_PATCH 1
#define ETL_VERSION_PATCH 2
#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)
#define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH)

2
library.json
View File

@ -1,6 +1,6 @@
{
"name": "Embedded Template Library",
"version": "16.4.1",
"version": "16.4.2",
"authors": {
"name": "John Wellbelove",
"email": "john.wellbelove@etlcpp.com"

2
library.properties
View File

@ -1,5 +1,5 @@
name=Embedded Template Library
version=16.4.1
version=16.4.2
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 @@
===============================================================================
16.4.2
Fix etl::pair error and warning.
===============================================================================
16.4.1
Moved icache.h to 'experimental' folder.

1
test/vs2017/DebugLLVMNoSTL/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*.exe