From 3ca0eb09d6e5041bcb85ee0d01fc38de6f5438dc Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Mon, 13 Jun 2022 20:35:20 +0200
Subject: [PATCH] Updated to newest IDF with new GCC

---
 src/configutils_base.h      | 6 ++++++
 src/configutils_priv_enum.h | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/configutils_base.h b/src/configutils_base.h
index 9cc4259..ec67cbb 100644
--- a/src/configutils_base.h
+++ b/src/configutils_base.h
@@ -14,10 +14,14 @@ namespace espconfig {
 
 inline esp_err_t nvs_get(nvs_handle handle, const char* key, int8_t* out_value)  { return nvs_get_i8 (handle, key, out_value); }
 inline esp_err_t nvs_get(nvs_handle handle, const char* key, uint8_t* out_value) { return nvs_get_u8 (handle, key, out_value); }
+//inline esp_err_t nvs_get(nvs_handle handle, const char* key, char* out_value)    { return nvs_get_i8 (handle, key, (int8_t*)out_value); }
+//inline esp_err_t nvs_get(nvs_handle handle, const char* key, unsigned char* out_value) { return nvs_get_u8 (handle, key, (uint8_t*)out_value); }
 inline esp_err_t nvs_get(nvs_handle handle, const char* key, int16_t* out_value) { return nvs_get_i16(handle, key, out_value); }
 inline esp_err_t nvs_get(nvs_handle handle, const char* key, uint16_t* out_value){ return nvs_get_u16(handle, key, out_value); }
 inline esp_err_t nvs_get(nvs_handle handle, const char* key, int32_t* out_value) { return nvs_get_i32(handle, key, out_value); }
 inline esp_err_t nvs_get(nvs_handle handle, const char* key, uint32_t* out_value){ return nvs_get_u32(handle, key, out_value); }
+inline esp_err_t nvs_get(nvs_handle handle, const char* key, int* out_value) { return nvs_get_i32(handle, key, (int32_t*)out_value); }
+inline esp_err_t nvs_get(nvs_handle handle, const char* key, unsigned int* out_value){ return nvs_get_u32(handle, key, (uint32_t*)out_value); }
 inline esp_err_t nvs_get(nvs_handle handle, const char* key, int64_t* out_value) { return nvs_get_i64(handle, key, out_value); }
 inline esp_err_t nvs_get(nvs_handle handle, const char* key, uint64_t* out_value){ return nvs_get_u64(handle, key, out_value); }
 inline esp_err_t nvs_get(nvs_handle handle, const char* key, bool* out_value)
@@ -67,6 +71,8 @@ inline esp_err_t nvs_set(nvs_handle handle, const char* key, int16_t value)
 inline esp_err_t nvs_set(nvs_handle handle, const char* key, uint16_t value)                  { return nvs_set_u16(handle, key, value); }
 inline esp_err_t nvs_set(nvs_handle handle, const char* key, int32_t value)                   { return nvs_set_i32(handle, key, value); }
 inline esp_err_t nvs_set(nvs_handle handle, const char* key, uint32_t value)                  { return nvs_set_u32(handle, key, value); }
+inline esp_err_t nvs_set(nvs_handle handle, const char* key, int value)                       { return nvs_set_i32(handle, key, value); }
+inline esp_err_t nvs_set(nvs_handle handle, const char* key, unsigned int value)              { return nvs_set_u32(handle, key, value); }
 inline esp_err_t nvs_set(nvs_handle handle, const char* key, const int64_t &value)            { return nvs_set_i64(handle, key, value); }
 inline esp_err_t nvs_set(nvs_handle handle, const char* key, const uint64_t &value)           { return nvs_set_u64(handle, key, value); }
 inline esp_err_t nvs_set(nvs_handle handle, const char* key, bool value)                      { return nvs_set_u8 (handle, key, value); }
diff --git a/src/configutils_priv_enum.h b/src/configutils_priv_enum.h
index 55c8e98..711f94c 100644
--- a/src/configutils_priv_enum.h
+++ b/src/configutils_priv_enum.h
@@ -6,6 +6,8 @@
 // esp-idf includes
 #include <nvs.h>
 
+#include <futurecpp.h>
+
 // local includes
 #include "configutils_base.h"
 
@@ -22,6 +24,6 @@
     \
     inline esp_err_t nvs_set(nvs_handle handle, const char* key, Name value) \
     { \
-        return nvs_set(handle, key, std::underlying_type_t<Name>(value)); \
+        return nvs_set(handle, key, std::to_underlying(value)); \
     } \
     } // namespace espconfig