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

Merge remote-tracking branch 'origin/feature/segger_stlport' into development

Browse Source
This commit is contained in:
John Wellbelove 2018-06-17 10:12:32 +01:00
commit dc5dbb56a7
10 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/etl/largest.h
View File

@ -33,7 +33,7 @@ SOFTWARE.
#endif
//***************************************************************************
// This file has been auto generated. Do not edit this file.
// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
//***************************************************************************
//***************************************************************************

2
include/etl/message_router.h
View File

@ -31,7 +31,7 @@ SOFTWARE.
#endif
//***************************************************************************
// This file has been auto generated. Do not edit this file.
// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
//***************************************************************************
//***************************************************************************

6
include/etl/pool.h
View File

@ -134,7 +134,7 @@ namespace etl
return reinterpret_cast<T*>(allocate_item());
}
#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE
#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE || defined(ETL_STLPORT)
//*************************************************************************
/// Allocate storage for an object from the pool and create default.
/// If asserts or exceptions are enabled and there are no more free items an
@ -499,7 +499,7 @@ namespace etl
return ipool::allocate<U>();
}
#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE
#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE || defined(ETL_STLPORT)
//*************************************************************************
/// Allocate storage for an object from the pool and create with default.
/// If asserts or exceptions are enabled and there are no more free items an
@ -650,7 +650,7 @@ namespace etl
return base_t::template allocate<U>();
}
#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE
#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE || defined(ETL_STLPORT)
//*************************************************************************
/// Allocate storage for an object from the pool and create with default.
/// If asserts or exceptions are enabled and there are no more free items an

2
include/etl/smallest.h
View File

@ -33,7 +33,7 @@ SOFTWARE.
#endif
//***************************************************************************
// This file has been auto generated. Do not edit this file.
// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
//***************************************************************************
//***************************************************************************

4
include/etl/type_traits_generator.h
View File

@ -281,14 +281,14 @@ namespace etl
/// is_pod
/// For C++03, only fundamental and pointers types are recognised.
///\ingroup type_traits
#if (ETL_CPP11_SUPPORTED && !defined(ARDUINO)) && !defined(ETL_IN_UNIT_TEST)
#if (ETL_CPP11_SUPPORTED && !defined(ARDUINO) && !defined(ETL_STLPORT)) && !defined(ETL_IN_UNIT_TEST)
// For compilers that support C++11
template <typename T> struct is_pod : std::is_pod<T> {};
#else
template <typename T> struct is_pod : etl::integral_constant<bool, etl::is_fundamental<T>::value || etl::is_pointer<T>::value> {};
#endif
#if (ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED) && !defined(ETL_IN_UNIT_TEST)
#if (ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED) && !defined(ETL_STLPORT) && !defined(ETL_IN_UNIT_TEST)
/// is_trivially_constructible
///\ingroup type_traits
template <typename T> struct is_trivially_constructible : std::is_trivially_constructible<T> {};

2
include/etl/variant.h
View File

@ -711,7 +711,7 @@ namespace etl
type_id = other.type_id;
}
#if !ETL_CPP11_SUPPORTED
#if !ETL_CPP11_SUPPORTED || defined(ETL_STLPORT)
//***************************************************************************
/// Emplace with one constructor parameter.
//***************************************************************************

2
include/etl/variant_pool.h
View File

@ -133,7 +133,7 @@ namespace etl
{
}
#if !ETL_CPP11_SUPPORTED
#if !ETL_CPP11_SUPPORTED || defined(ETL_STLPORT)
//*************************************************************************
/// Creates the object. Default constructor.
//*************************************************************************

2
include/etl/variant_pool_generator.h
View File

@ -140,7 +140,7 @@ namespace etl
{
}
#if !ETL_CPP11_SUPPORTED
#if !ETL_CPP11_SUPPORTED || defined(ETL_STLPORT)
//*************************************************************************
/// Creates the object. Default constructor.
//*************************************************************************

4
include/etl/version.h
View File

@ -37,10 +37,10 @@ SOFTWARE.
/// Definitions of the ETL version
///\ingroup utilities
#define ETL_VERSION "11.11.0"
#define ETL_VERSION "11.11.1"
#define ETL_VERSION_MAJOR 11
#define ETL_VERSION_MINOR 11
#define ETL_VERSION_PATCH 0
#define ETL_VERSION_PATCH 1
#endif

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
11.11.1
Compatibilty changes for Segger IDE, GCC & STLPort
===============================================================================
11.11.0
Compatibilty changes for Segger IDE, GCC & STLPort