diff options
Diffstat (limited to 'searchcore')
7 files changed, 6 insertions, 12 deletions
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt b/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt index 48f64db5d82..e8606a6dbad 100644 --- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt +++ b/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt @@ -5,6 +5,4 @@ vespa_add_executable(searchcore_disk_mem_usage_filter_test_app TEST DEPENDS searchcore_server ) -vespa_add_target_system_dependency(searchcore_disk_mem_usage_filter_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(searchcore_disk_mem_usage_filter_test_app boost boost_filesystem-mt-d) vespa_add_test(NAME searchcore_disk_mem_usage_filter_test_app COMMAND searchcore_disk_mem_usage_filter_test_app) 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 148ea5d8a43..f08121f46f6 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 @@ LOG_SETUP("disk_mem_usage_filter_test"); using proton::DiskMemUsageFilter; -namespace fs = boost::filesystem; +namespace fs = std::experimental::filesystem; namespace { diff --git a/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt b/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt index 247bda1f5f8..47eae6f18dc 100644 --- a/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt +++ b/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt @@ -5,6 +5,4 @@ vespa_add_executable(searchcore_visibility_handler_test_app TEST DEPENDS searchcore_server ) -vespa_add_target_system_dependency(searchcore_visibility_handler_test_app boost boost_system-mt-d) -vespa_add_target_system_dependency(searchcore_visibility_handler_test_app boost boost_filesystem-mt-d) vespa_add_test(NAME searchcore_visibility_handler_test_app COMMAND searchcore_visibility_handler_test_app) diff --git a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt index 01bc87761fc..afcbffb28e8 100644 --- a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt @@ -113,6 +113,5 @@ vespa_add_library(searchcore_server STATIC searchcore_summaryengine searchcore_fconfig configdefinitions + stdc++fs ) -vespa_add_target_system_dependency(searchcore_server boost boost_system-mt-d) -vespa_add_target_system_dependency(searchcore_server boost boost_filesystem-mt-d) 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 20cd436cc17..b10a28b6ff0 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 @@ -2,7 +2,7 @@ #pragma once -#include <boost/filesystem.hpp> +#include <experimental/filesystem> #include <vespa/vespalib/util/process_memory_stats.h> #include <vespa/searchcore/proton/persistenceengine/i_resource_write_filter.h> #include <mutex> @@ -20,7 +20,7 @@ namespace proton { class DiskMemUsageFilter : public IResourceWriteFilter, public IDiskMemUsageNotifier { public: - using space_info = boost::filesystem::space_info; + using space_info = std::experimental::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 b66ec26bd05..3dd6b36dc45 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 @@ -55,7 +55,7 @@ DiskMemUsageSampler::sampleUsage() void DiskMemUsageSampler::sampleDiskUsage() { - _filter.setDiskStats(boost::filesystem::space(_path)); + _filter.setDiskStats(std::experimental::filesystem::space(_path)); } void 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 0e95a52ba46..6b6b39074a3 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 @@ -3,7 +3,6 @@ #pragma once #include "disk_mem_usage_filter.h" -#include <boost/filesystem.hpp> namespace vespalib { class Timer; } @@ -14,7 +13,7 @@ namespace proton { */ class DiskMemUsageSampler { DiskMemUsageFilter _filter; - boost::filesystem::path _path; + std::experimental::filesystem::path _path; double _sampleInterval; std::unique_ptr<vespalib::Timer> _periodicTimer; |