Merge pull request #28037 from vespa-engine/balder/use-interfaces-for-looking-up-index-from-node

- Avoid going via a temporary IdealNodesList.

2 files changed, 4 insertions, 2 deletions

diff --git a/vespalib/src/vespa/vespalib/stllike/hash_map.cpp b/vespalib/src/vespa/vespalib/stllike/hash_map.cpp
index abb88fe674f..50a3d73fe12 100644
--- a/vespalib/src/vespa/vespalib/stllike/hash_map.cpp
+++ b/vespalib/src/vespa/vespalib/stllike/hash_map.cpp
@@ -16,6 +16,7 @@ VESPALIB_HASH_MAP_INSTANTIATE(vespalib::string, double);
 VESPALIB_HASH_MAP_INSTANTIATE(int64_t, int32_t);
 VESPALIB_HASH_MAP_INSTANTIATE(int64_t, uint32_t);
 VESPALIB_HASH_MAP_INSTANTIATE(int32_t, uint32_t);
+VESPALIB_HASH_MAP_INSTANTIATE(uint16_t, uint16_t);
 VESPALIB_HASH_MAP_INSTANTIATE(uint16_t, uint32_t);
 VESPALIB_HASH_MAP_INSTANTIATE(uint32_t, int32_t);
 VESPALIB_HASH_MAP_INSTANTIATE(uint32_t, uint32_t);
diff --git a/vespalib/src/vespa/vespalib/util/mmap_file_allocator.cpp b/vespalib/src/vespa/vespalib/util/mmap_file_allocator.cpp
index 51a639a3c4e..f711d3d8685 100644
--- a/vespalib/src/vespa/vespalib/util/mmap_file_allocator.cpp
+++ b/vespalib/src/vespa/vespalib/util/mmap_file_allocator.cpp
@@ -11,6 +11,7 @@
 #include <filesystem>
 
 using vespalib::make_string_short::fmt;
+namespace fs = std::filesystem;
 
 namespace vespalib::alloc {
 
@@ -21,7 +22,7 @@ MmapFileAllocator::MmapFileAllocator(const vespalib::string& dir_name)
       _allocations(),
       _freelist()
 {
-    std::filesystem::create_directories(std::filesystem::path(_dir_name));
+    fs::create_directories(fs::path(_dir_name));
     _file.open(O_RDWR | O_CREAT | O_TRUNC, false);
 }
 
@@ -30,7 +31,7 @@ MmapFileAllocator::~MmapFileAllocator()
     assert(_allocations.empty());
     _file.close();
     _file.unlink();
-    std::filesystem::remove_all(std::filesystem::path(_dir_name));
+    fs::remove_all(fs::path(_dir_name));
 }
 
 uint64_t