pw_kvs: Move entry.h to public/pw_kvs/internal
Move entry.h so that the KeyValueStore class can reference it in the
header.
Change-Id: Ib5a7f194db8dd9af1e8f3d8c9c7c25b8409acfe0
diff --git a/pw_kvs/key_value_store.cc b/pw_kvs/key_value_store.cc
index ca49b5c..b1b5148 100644
--- a/pw_kvs/key_value_store.cc
+++ b/pw_kvs/key_value_store.cc
@@ -20,19 +20,18 @@
#include <type_traits>
#define PW_LOG_USE_ULTRA_SHORT_NAMES 1
-#include "pw_kvs_private/entry.h"
+#include "pw_kvs/internal/entry.h"
#include "pw_kvs_private/macros.h"
#include "pw_log/log.h"
namespace pw::kvs {
namespace {
-using internal::Entry;
using std::byte;
using std::string_view;
constexpr bool InvalidKey(std::string_view key) {
- return key.empty() || (key.size() > Entry::kMaxKeyLength);
+ return key.empty() || (key.size() > internal::Entry::kMaxKeyLength);
}
} // namespace
@@ -732,10 +731,10 @@
return Status::OK;
}
-Entry KeyValueStore::CreateEntry(Address address,
- std::string_view key,
- span<const byte> value,
- KeyDescriptor::State state) {
+KeyValueStore::Entry KeyValueStore::CreateEntry(Address address,
+ std::string_view key,
+ span<const byte> value,
+ KeyDescriptor::State state) {
last_transaction_id_ += 1;
if (state == KeyDescriptor::kDeleted) {