From 8ba64c4139bfaa479288081f51e06c11b4b48e16 Mon Sep 17 00:00:00 2001 From: Lingkai Dong Date: Wed, 11 Nov 2020 16:26:50 +0000 Subject: [PATCH] Update include paths --- drivers/device_key/source/DeviceKey.cpp | 4 ++-- storage/kvstore/kv_config/source/kv_config.cpp | 6 +++--- .../tests/TESTS/direct_access_devicekey/tdb/main.cpp | 4 ++-- .../tests/TESTS/kvstore/general_tests_phase_1/main.cpp | 2 +- .../tests/TESTS/kvstore/general_tests_phase_2/main.cpp | 2 +- storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp | 2 +- .../kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp | 2 +- storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/device_key/source/DeviceKey.cpp b/drivers/device_key/source/DeviceKey.cpp index bf60efd067..decdd52602 100644 --- a/drivers/device_key/source/DeviceKey.cpp +++ b/drivers/device_key/source/DeviceKey.cpp @@ -21,8 +21,8 @@ #include "mbedtls/cmac.h" #include "mbedtls/platform.h" #include "kvstore/KVStore.h" -#include "kvstore/TDBStore.h" -#include "kvstore/KVMap.h" +#include "tdbstore/TDBStore.h" +#include "kvstore_global_api/KVMap.h" #include "kv_config/kv_config.h" #include "mbed_wait_api.h" #include diff --git a/storage/kvstore/kv_config/source/kv_config.cpp b/storage/kvstore/kv_config/source/kv_config.cpp index 187ec74a3b..682535a75c 100644 --- a/storage/kvstore/kv_config/source/kv_config.cpp +++ b/storage/kvstore/kv_config/source/kv_config.cpp @@ -16,14 +16,14 @@ #include "kv_config.h" #include "kvstore/KVStore.h" -#include "kvstore/KVMap.h" +#include "kvstore_global_api/KVMap.h" #include "blockdevice/BlockDevice.h" #include "filesystem/FileSystem.h" -#include "kvstore/FileSystemStore.h" +#include "filesystemstore/FileSystemStore.h" #include "blockdevice/SlicingBlockDevice.h" #include "fat/FATFileSystem.h" #include "littlefs/LittleFileSystem.h" -#include "kvstore/TDBStore.h" +#include "tdbstore/TDBStore.h" #include "mbed_error.h" #include "drivers/FlashIAP.h" #include "blockdevice/FlashSimBlockDevice.h" diff --git a/storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp b/storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp index 204670ff03..eb9a3c1a0f 100644 --- a/storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp +++ b/storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp @@ -24,9 +24,9 @@ #include #include "DeviceKey.h" #include "kvstore/KVStore.h" -#include "kvstore/KVMap.h" +#include "kvstore_global_api/KVMap.h" #include "kv_config/kv_config.h" -#include "kvstore/TDBStore.h" +#include "tdbstore/TDBStore.h" #include "FlashIAP.h" #include "FlashIAPBlockDevice.h" #include "direct_access_devicekey/DirectAccessDevicekey.h" diff --git a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp index ef7ad4d346..d225294f92 100644 --- a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp +++ b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ #include "securestore/SecureStore.h" -#include "kvstore/TDBStore.h" +#include "tdbstore/TDBStore.h" #ifdef MBED_CONF_RTOS_PRESENT #include "Thread.h" #endif diff --git a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp index f19560858e..275c024244 100644 --- a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp +++ b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ #include "securestore/SecureStore.h" -#include "kvstore/TDBStore.h" +#include "tdbstore/TDBStore.h" #include "mbed_error.h" #include "FlashSimBlockDevice.h" #include "SlicingBlockDevice.h" diff --git a/storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp b/storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp index 5cb1b2183f..8c10e068dc 100644 --- a/storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp +++ b/storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp @@ -17,7 +17,7 @@ */ #include "securestore/SecureStore.h" -#include "kvstore/TDBStore.h" +#include "tdbstore/TDBStore.h" #ifdef MBED_CONF_RTOS_PRESENT #include "Thread.h" #endif diff --git a/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp b/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp index 531c60e42a..6e910901cc 100644 --- a/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp +++ b/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp @@ -16,7 +16,7 @@ #include "gtest/gtest.h" #include "blockdevice/HeapBlockDevice.h" -#include "kvstore/FileSystemStore.h" +#include "filesystemstore/FileSystemStore.h" #include "littlefs/LittleFileSystem.h" #include "mbed_error.h" #include diff --git a/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp b/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp index c51680e5f9..6a124e1d6e 100644 --- a/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp +++ b/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp @@ -17,7 +17,7 @@ #include "gtest/gtest.h" #include "blockdevice/HeapBlockDevice.h" #include "blockdevice/FlashSimBlockDevice.h" -#include "kvstore/TDBStore.h" +#include "tdbstore/TDBStore.h" #include #define BLOCK_SIZE (256)