From 4d7678dd9bf38a0bed10080bac9cf4321e35cd39 Mon Sep 17 00:00:00 2001 From: Hideaki Tai Date: Wed, 30 Sep 2020 16:07:06 +0900 Subject: [PATCH] update ArxContainer --- util/ArxContainer/ArxContainer/has_include.h | 3 ++- util/ArxContainer/ArxContainer/initializer_list.h | 2 +- util/ArxContainer/README.md | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/util/ArxContainer/ArxContainer/has_include.h b/util/ArxContainer/ArxContainer/has_include.h index 76b39a9..d605d71 100644 --- a/util/ArxContainer/ArxContainer/has_include.h +++ b/util/ArxContainer/ArxContainer/has_include.h @@ -17,7 +17,8 @@ #define ARX_SYSTEM_HAS_INCLUDE(x) 1 #elif defined(ARDUINO_SAM_DUE) // Arduino DUE's GCC version is 4.8.3 (GCC < 5.0). - // And it has not libstdc++ + // If libstdc++ is used, std::function causes error + // so currently we disable libstdc++ and use ArxTypeTraits #define ARX_SYSTEM_HAS_INCLUDE(x) 0 #else #error "Compiler does not support __has_include, please report a bug against the ArxTypeTraits library about this." diff --git a/util/ArxContainer/ArxContainer/initializer_list.h b/util/ArxContainer/ArxContainer/initializer_list.h index cdd1e5d..b1cd74f 100644 --- a/util/ArxContainer/ArxContainer/initializer_list.h +++ b/util/ArxContainer/ArxContainer/initializer_list.h @@ -7,7 +7,7 @@ // define it when is really not available (e.g. // ArduinoSTL is C++98 but *does* define ) and not // already defined (e.g. by ArxContainer). -#if __has_include() +#if ARX_SYSTEM_HAS_INCLUDE() #include #else namespace std { diff --git a/util/ArxContainer/README.md b/util/ArxContainer/README.md index 4a90558..749d310 100644 --- a/util/ArxContainer/README.md +++ b/util/ArxContainer/README.md @@ -163,6 +163,8 @@ PRs are welcome! - [ArtNet](https://github.com/hideakitai/ArtNet) - [Tween](https://github.com/hideakitai/Tween) - [TimeProfiler](https://github.com/hideakitai/TimeProfiler) +- [SceneManager](https://github.com/hideakitai/SceneManager) +- [TaskManager](https://github.com/hideakitai/TaskManager) ## License