diff --git a/README.md b/README.md index 7c6f278..51453d3 100644 --- a/README.md +++ b/README.md @@ -254,7 +254,7 @@ Please use only sender OR receiver. ## Embedded Libraries -- [ArxContainer v0.3.9](https://github.com/hideakitai/ArxContainer) +- [ArxContainer v0.3.10](https://github.com/hideakitai/ArxContainer) - [ArxTypeTraits v0.2.0](https://github.com/hideakitai/ArxTypeTraits) - [TeensyDirtySTLErrorSolution v0.1.0](https://github.com/hideakitai/TeensyDirtySTLErrorSolution) diff --git a/util/ArxContainer/ArxContainer.h b/util/ArxContainer/ArxContainer.h index f7bacf6..aaaa081 100644 --- a/util/ArxContainer/ArxContainer.h +++ b/util/ArxContainer/ArxContainer.h @@ -10,7 +10,9 @@ #include "ArxContainer/has_include.h" #include "ArxContainer/has_libstdcplusplus.h" -#include +#ifdef ARDUINO + #include +#endif #include "ArxContainer/replace_minmax_macros.h" #include "ArxContainer/initializer_list.h" diff --git a/util/ArxContainer/ArxContainer/replace_minmax_macros.h b/util/ArxContainer/ArxContainer/replace_minmax_macros.h index 9668ccc..f8ff86e 100644 --- a/util/ArxContainer/ArxContainer/replace_minmax_macros.h +++ b/util/ArxContainer/ArxContainer/replace_minmax_macros.h @@ -6,7 +6,9 @@ // Make sure Arduino.h is actually included, since otherwise it might be // included later and break *uses* of the min/max methods, rather than // the declarations of it. -#include +#ifdef ARDUINO + #include +#endif // These macros are defined by Arduino.h on some platforms, and conflict // with min/max methods defined or included by ArxTypeTraits, so replace diff --git a/util/ArxContainer/README.md b/util/ArxContainer/README.md index 749d310..8786bfa 100644 --- a/util/ArxContainer/README.md +++ b/util/ArxContainer/README.md @@ -165,6 +165,8 @@ PRs are welcome! - [TimeProfiler](https://github.com/hideakitai/TimeProfiler) - [SceneManager](https://github.com/hideakitai/SceneManager) - [TaskManager](https://github.com/hideakitai/TaskManager) +- [ArxStringUtils](https://github.com/hideakitai/ArxStringUtils) +- [Debouncer](https://github.com/hideakitai/Debouncer) ## License diff --git a/util/ArxContainer/library.json b/util/ArxContainer/library.json index 2c746d7..d2342a7 100644 --- a/util/ArxContainer/library.json +++ b/util/ArxContainer/library.json @@ -11,7 +11,7 @@ "url": "https://github.com/hideakitai", "maintainer": true }, - "version": "0.3.9", + "version": "0.3.10", "license": "MIT", "frameworks": "arduino", "platforms": "*" diff --git a/util/ArxContainer/library.properties b/util/ArxContainer/library.properties index a1b55ec..408a80d 100644 --- a/util/ArxContainer/library.properties +++ b/util/ArxContainer/library.properties @@ -1,5 +1,5 @@ name=ArxContainer -version=0.3.9 +version=0.3.10 author=hideakitai maintainer=hideakitai sentence=C++ container-like classes (vector, map, etc.) for Arduino which cannot use STL