diff --git a/include/etl/algorithm.h b/include/etl/algorithm.h index 31b0b0fc..6a2714ec 100644 --- a/include/etl/algorithm.h +++ b/include/etl/algorithm.h @@ -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 diff --git a/include/etl/flat_multimap.h b/include/etl/flat_multimap.h index e25588fd..f7955984 100644 --- a/include/etl/flat_multimap.h +++ b/include/etl/flat_multimap.h @@ -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 diff --git a/include/etl/indirect_vector.h b/include/etl/indirect_vector.h index 09511ddb..102583bf 100644 --- a/include/etl/indirect_vector.h +++ b/include/etl/indirect_vector.h @@ -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) diff --git a/include/etl/memory.h b/include/etl/memory.h index ad6b6aee..5b59ce90 100644 --- a/include/etl/memory.h +++ b/include/etl/memory.h @@ -34,8 +34,8 @@ SOFTWARE. #include "platform.h" #include "algorithm.h" #include "type_traits.h" - #include "iterator.h" +#include "utility.h" #include diff --git a/include/etl/pool.h b/include/etl/pool.h index 8f051420..9f8fba81 100644 --- a/include/etl/pool.h +++ b/include/etl/pool.h @@ -37,7 +37,7 @@ SOFTWARE. #include "algorithm.h" #include "iterator.h" - +#include "utility.h" #include "error_handler.h" #include "alignment.h" #include "array.h" diff --git a/include/etl/priority_queue.h b/include/etl/priority_queue.h index 8f1174ed..2803139e 100644 --- a/include/etl/priority_queue.h +++ b/include/etl/priority_queue.h @@ -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" diff --git a/include/etl/stack.h b/include/etl/stack.h index b0e5d351..26a9c398 100644 --- a/include/etl/stack.h +++ b/include/etl/stack.h @@ -37,9 +37,8 @@ SOFTWARE. #include #include "platform.h" - #include "algorithm.h" - +#include "utility.h" #include "container.h" #include "alignment.h" #include "array.h" diff --git a/include/etl/utility.h b/include/etl/utility.h index a5f1af4e..3b79f30a 100644 --- a/include/etl/utility.h +++ b/include/etl/utility.h @@ -132,7 +132,7 @@ namespace etl swap(second, other.second); } - pair& operator =(const pair& other) + pair& operator =(const pair& other) { first = other.first; second = other.second; @@ -141,7 +141,7 @@ namespace etl } template - pair& operator =(const pair& other) + pair& operator =(const pair& other) { first = other.first; second = other.second; @@ -150,7 +150,7 @@ namespace etl } #if ETL_CPP11_SUPPORTED - pair& operator =(pair&& other) + pair& operator =(pair&& other) { first = etl::move(other.first); second = etl::move(other.second); @@ -159,7 +159,7 @@ namespace etl } template - pair& operator =(pair&& other) + pair& operator =(pair&& other) { first = etl::move(other.first); second = etl::move(other.second); diff --git a/include/etl/variant.h b/include/etl/variant.h index 624c2310..6ceb9c46 100644 --- a/include/etl/variant.h +++ b/include/etl/variant.h @@ -36,6 +36,7 @@ SOFTWARE. #include #include "platform.h" +#include "utility.h" #include "array.h" #include "largest.h" #include "exception.h" diff --git a/include/etl/version.h b/include/etl/version.h index 1af2851f..94fa8d22 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -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) diff --git a/library.json b/library.json index c263db8b..99059fc2 100644 --- a/library.json +++ b/library.json @@ -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" diff --git a/library.properties b/library.properties index a773a8de..124bb891 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=16.4.1 +version=16.4.2 author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/support/Release notes.txt b/support/Release notes.txt index 4924c077..96083f41 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +16.4.2 +Fix etl::pair error and warning. + =============================================================================== 16.4.1 Moved icache.h to 'experimental' folder. diff --git a/test/vs2017/DebugLLVMNoSTL/.gitignore b/test/vs2017/DebugLLVMNoSTL/.gitignore new file mode 100644 index 00000000..b883f1fd --- /dev/null +++ b/test/vs2017/DebugLLVMNoSTL/.gitignore @@ -0,0 +1 @@ +*.exe