Merge pull request #10146 from vespa-engine/toregge/use-std-filesystem

Use std::filesystem instead of std::experimental::filesystem.

5 files changed, 9 insertions, 9 deletions

diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
index fb0c9b1f3a9..5c8ed28cd66 100644
--- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
+++ b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
@@ -7,7 +7,7 @@
 
 using namespace proton;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 struct Fixture
 {
diff --git a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
index 1492a34b241..642d5a40ac7 100644
--- a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
@@ -8,7 +8,7 @@
 #include <vespa/fastos/file.h>
 #include <vespa/searchcore/config/config-hwinfo.h>
 #include <vespa/vespalib/io/fileutil.h>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <thread>
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.common.hw_info_sampler");
@@ -32,8 +32,8 @@ sampleDiskSizeBytes(const std::string &pathStr, const HwInfoSampler::Config &cfg
     if (cfg.diskSizeBytes != 0) {
         return cfg.diskSizeBytes;
     }
-    std::experimental::filesystem::path path(pathStr);
-    auto space_info = std::experimental::filesystem::space(path);
+    std::filesystem::path path(pathStr);
+    auto space_info = std::filesystem::space(path);
     return space_info.capacity;
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.h b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.h
index 982e3bba6fd..b9047d47793 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.h
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.h
@@ -8,7 +8,7 @@
 #include <vespa/searchcore/proton/persistenceengine/i_resource_write_filter.h>
 #include <vespa/vespalib/util/process_memory_stats.h>
 #include <atomic>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <mutex>
 
 namespace proton {
@@ -21,7 +21,7 @@ namespace proton {
 class DiskMemUsageFilter : public IResourceWriteFilter,
                            public IDiskMemUsageNotifier {
 public:
-    using space_info = std::experimental::filesystem::space_info;
+    using space_info = std::filesystem::space_info;
     using Mutex = std::mutex;
     using Guard = std::lock_guard<Mutex>;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
index 7ef8c53d4dd..37f1664841a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
@@ -3,7 +3,7 @@
 #include "disk_mem_usage_sampler.h"
 #include <vespa/vespalib/util/timer.h>
 #include <vespa/vespalib/util/lambdatask.h>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <unistd.h>
 
 using vespalib::makeLambdaTask;
@@ -47,7 +47,7 @@ DiskMemUsageSampler::sampleUsage()
 
 namespace {
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 uint64_t
 sampleDiskUsageOnFileSystem(const fs::path &path, const HwInfo::Disk &disk)
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
index 4ed48613f6a..5a439e69003 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
@@ -13,7 +13,7 @@ namespace proton {
  */
 class DiskMemUsageSampler {
     DiskMemUsageFilter _filter;
-    std::experimental::filesystem::path _path;
+    std::filesystem::path _path;
     double _sampleInterval;
     std::unique_ptr<vespalib::Timer> _periodicTimer;