Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keil 5 fixes #293

Merged
merged 9 commits into from
Oct 27, 2020
Merged

Keil 5 fixes #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
db92c61
Merge pull request #1 from ETLCPP/master
rolan-reznik Dec 4, 2019
39741e0
Merge pull request #2 from ETLCPP/master
rolan-reznik Dec 20, 2019
705d146
Merge pull request #4 from ETLCPP/master
rolan-reznik Jan 6, 2020
0cbdd1f
Merge pull request #5 from ETLCPP/master
rolan-reznik May 28, 2020
2009f2d
Merge pull request #6 from ETLCPP/master
rolan-reznik Aug 28, 2020
086c802
Merge pull request #7 from ETLCPP/master
rolan-reznik Oct 26, 2020
be76bbf
unordered_map fix for non c++11 profiles.
rolan-reznik Oct 26, 2020
2adef76
__USE_C99_MATH fix for armcc5
rolan-reznik Oct 26, 2020
e27eb69
is_convertible fix for armcc5
rolan-reznik Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/etl/limits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ SOFTWARE.
#include "char_traits.h"
#include "integral_limits.h"

#if ETL_NOT_USING_STL && defined(ETL_COMPILER_ARM5)
#if ETL_NOT_USING_STL && defined(ETL_COMPILER_ARM5) && !defined(__USE_C99_MATH)
// Required for nan, nanf, nanl
#define __USE_C99_MATH
#endif
Expand Down
6 changes: 5 additions & 1 deletion include/etl/type_traits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,12 +736,16 @@ namespace etl
template <typename, typename>
auto nonvoid_convertible(...)->etl::false_type;
}

#if defined(ETL_COMPILER_ARM5)
template <typename TFrom, typename TTo>
struct is_convertible : etl::integral_constant<bool, __is_convertible_to(TFrom, TTo)> {};
#else
template <typename TFrom, typename TTo>
struct is_convertible : etl::integral_constant<bool, (decltype(private_type_traits::returnable<TTo>(0))::value &&
decltype(private_type_traits::nonvoid_convertible<TFrom, TTo>(0))::value) ||
(etl::is_void<TFrom>::value && etl::is_void<TTo>::value)> {};
#endif
#endif

#if ETL_CPP17_SUPPORTED
template <typename TFrom, typename TTo >
Expand Down
3 changes: 2 additions & 1 deletion include/etl/unordered_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,7 @@ namespace etl

return *this;
}

#if ETL_CPP11_SUPPORTED
//*************************************************************************
/// Move assignment operator.
//*************************************************************************
Expand All @@ -1320,6 +1320,7 @@ namespace etl

return *this;
}
#endif

protected:

Expand Down