From fc418cc7825b75bd1212a60001704d5cc8bab5f3 Mon Sep 17 00:00:00 2001
From: timoxd7 <timoxd7@gmx.de>
Date: Wed, 26 Mar 2025 13:35:33 +0100
Subject: [PATCH] fix(nvs_flash): removed usage of 'using namepsace std' in a
 header file

---
 components/nvs_flash/src/nvs_cxx_api.cpp           | 2 ++
 components/nvs_flash/src/nvs_pagemanager.cpp       | 2 ++
 components/nvs_flash/src/nvs_partition_manager.cpp | 2 ++
 components/nvs_flash/src/nvs_types.hpp             | 4 +---
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/components/nvs_flash/src/nvs_cxx_api.cpp b/components/nvs_flash/src/nvs_cxx_api.cpp
index b315fecdf1..09d76dffbe 100644
--- a/components/nvs_flash/src/nvs_cxx_api.cpp
+++ b/components/nvs_flash/src/nvs_cxx_api.cpp
@@ -17,6 +17,8 @@
 #include "nvs_handle_locked.hpp"
 #include "nvs_platform.hpp"
 
+using namespace std;
+
 namespace nvs {
 
 std::unique_ptr<NVSHandle> open_nvs_handle_from_partition(const char *partition_name,
diff --git a/components/nvs_flash/src/nvs_pagemanager.cpp b/components/nvs_flash/src/nvs_pagemanager.cpp
index 9bbe32c98a..5b5dbe21f5 100644
--- a/components/nvs_flash/src/nvs_pagemanager.cpp
+++ b/components/nvs_flash/src/nvs_pagemanager.cpp
@@ -5,6 +5,8 @@
  */
 #include "nvs_pagemanager.hpp"
 
+using namespace std;
+
 namespace nvs
 {
 esp_err_t PageManager::load(Partition *partition, uint32_t baseSector, uint32_t sectorCount)
diff --git a/components/nvs_flash/src/nvs_partition_manager.cpp b/components/nvs_flash/src/nvs_partition_manager.cpp
index f267aa668f..8a7e0c6ed0 100644
--- a/components/nvs_flash/src/nvs_partition_manager.cpp
+++ b/components/nvs_flash/src/nvs_partition_manager.cpp
@@ -12,6 +12,8 @@
 #include "nvs_encrypted_partition.hpp"
 #endif // ! LINUX_TARGET
 
+using namespace std;
+
 namespace nvs {
 
 NVSPartitionManager* NVSPartitionManager::instance = nullptr;
diff --git a/components/nvs_flash/src/nvs_types.hpp b/components/nvs_flash/src/nvs_types.hpp
index 5eda9abcd9..1761fa0354 100644
--- a/components/nvs_flash/src/nvs_types.hpp
+++ b/components/nvs_flash/src/nvs_types.hpp
@@ -15,8 +15,6 @@
 #include "compressed_enum_table.hpp"
 #include "string.h"
 
-using namespace std;
-
 namespace nvs
 {
 
@@ -97,7 +95,7 @@ public:
 
     void getKey(char* dst, size_t dstSize)
     {
-        strncpy(dst, key, min(dstSize, sizeof(key)));
+        strncpy(dst, key, std::min(dstSize, sizeof(key)));
         dst[dstSize-1] = 0;
     }