Verified Commit 43112a9c authored by Marc Vef's avatar Marc Vef
Browse files

c++17 replace boost with std for optional and filesystem

parent 383d1535

CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -90,10 +90,9 @@ find_package(Abt REQUIRED) 
find_package(Margo REQUIRED)

find_package(Syscall_intercept REQUIRED)



# boost dependencies, system is required for filesystem

# boost dependencies

find_package(Boost 1.53 REQUIRED

    COMPONENTS

    filesystem

    program_options

    )

include/client/logging.hpp

+2 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
#include <libsyscall_intercept_hook_point.h>



#include <type_traits>

#include <boost/optional.hpp>

#include <client/make_array.hpp>

#include <client/syscalls.hpp>

#include <optional>

#include <fmt/format.h>

#include <fmt/ostream.h>

#include <date/tz.h>
@@ -375,7 +375,7 @@ struct logger { 


    void

    log_syscall(syscall::info info, const long syscall_number,

                const long args[6], boost::optional<long> result = boost::none);

                const long args[6], std::optional<long> result = {});



    static std::shared_ptr<logger>&

    global_logger() {

include/client/make_array.hpp

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#ifndef LIBGKFS_UTILS_MAKE_ARRAY_HPP

#define LIBGKFS_UTILS_MAKE_ARRAY_HPP



#include <array>



namespace gkfs {

namespace util {

include/client/syscalls/args.hpp

+4 −2
Original line number Diff line number Diff line
@@ -18,12 +18,14 @@ 
#define GKFS_SYSCALLS_ARGS_HPP



#include <fcntl.h>

#include <signal.h>

#include <csignal>

#include <cassert>

#include <sys/mman.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <syscall.h>

#include <unistd.h>

#include <optional>



#include <type_traits>

#include <fmt/format.h>
@@ -78,7 +80,7 @@ static constexpr auto generic = type::generic; 
struct printable_arg {

    const char* const name;

    const long value;

    boost::optional<long> size;

    std::optional<long> size;

};

src/client/intercept.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <client/hooks.hpp>

#include <client/logging.hpp>



#include <boost/optional.hpp>

#include <optional>

#include <fmt/format.h>



#include <cerrno>