From 48475ded48919d6adf8b1691f375f656b0ccdf39 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 3 Feb 2019 21:14:08 +0000 Subject: Remove boost::filesystem in favour of std::filesystem --- libjsonpp/Jamfile.jam | 12 ++++-------- libjsonpp/testEncoding.cpp | 4 ++-- libjsonpp/testParse.cpp | 4 ++-- libjsonpp/testSerialise.cpp | 4 ++-- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/libjsonpp/Jamfile.jam b/libjsonpp/Jamfile.jam index 6ec0d6f..8ebe4cb 100644 --- a/libjsonpp/Jamfile.jam +++ b/libjsonpp/Jamfile.jam @@ -3,8 +3,7 @@ import testing ; import lex ; lib boost_utf : : boost_unit_test_framework ; -lib boost_system ; -lib boost_filesystem ; +lib stdc++fs ; path-constant me : . ; @@ -25,8 +24,7 @@ run BOOST_TEST_DYN_LINK jsonpp boost_utf - boost_system - boost_filesystem + stdc++fs : testParse ; @@ -38,8 +36,7 @@ run BOOST_TEST_DYN_LINK jsonpp boost_utf - boost_system - boost_filesystem + stdc++fs : testSerialise ; @@ -51,8 +48,7 @@ run BOOST_TEST_DYN_LINK jsonpp boost_utf - boost_system - boost_filesystem + stdc++fs : testEncoding ; diff --git a/libjsonpp/testEncoding.cpp b/libjsonpp/testEncoding.cpp index 26386df..80efcb4 100644 --- a/libjsonpp/testEncoding.cpp +++ b/libjsonpp/testEncoding.cpp @@ -3,11 +3,11 @@ #include "jsonpp.h" #include -#include +#include #define XSTR(s) STR(s) #define STR(s) #s -const boost::filesystem::path root(XSTR(ROOT)); +const std::filesystem::path root(XSTR(ROOT)); static std::string diff --git a/libjsonpp/testParse.cpp b/libjsonpp/testParse.cpp index 1fddab8..182f758 100644 --- a/libjsonpp/testParse.cpp +++ b/libjsonpp/testParse.cpp @@ -3,11 +3,11 @@ #include "jsonpp.h" #include -#include +#include #define XSTR(s) STR(s) #define STR(s) #s -const boost::filesystem::path root(XSTR(ROOT)); +const std::filesystem::path root(XSTR(ROOT)); BOOST_AUTO_TEST_CASE( parse_bool_true ) { diff --git a/libjsonpp/testSerialise.cpp b/libjsonpp/testSerialise.cpp index 04f95ac..05ddce4 100644 --- a/libjsonpp/testSerialise.cpp +++ b/libjsonpp/testSerialise.cpp @@ -3,11 +3,11 @@ #include "jsonpp.h" #include -#include +#include #define XSTR(s) STR(s) #define STR(s) #s -const boost::filesystem::path root(XSTR(ROOT)); +const std::filesystem::path root(XSTR(ROOT)); using namespace std::literals; -- cgit v1.2.3