From fb430942bf82a2e14f1d06dbf09a71a70ba10a8e Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 3 Feb 2019 20:22:09 +0000 Subject: Remove boost::filesystem in favour of std::filesystem --- libmysqlpp/Jamfile.jam | 2 -- libmysqlpp/my-mock.cpp | 2 +- libmysqlpp/my-mock.h | 4 ++-- libmysqlpp/unittests/Jamfile.jam | 6 ++---- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/libmysqlpp/Jamfile.jam b/libmysqlpp/Jamfile.jam index c49b085..4ba2902 100644 --- a/libmysqlpp/Jamfile.jam +++ b/libmysqlpp/Jamfile.jam @@ -4,7 +4,6 @@ lib mysqlclient : : : : /usr/include/mysql ; lib adhocutil : : : : /usr/include/adhocutil ; lib dbppcore : : : : /usr/include/dbpp ; lib boost_date_time ; -lib boost_system ; lib dbpp-mysql : [ glob my-*.cpp ] : @@ -13,7 +12,6 @@ lib dbpp-mysql : dbppcore adhocutil boost_date_time - boost_system : : . mysqlclient diff --git a/libmysqlpp/my-mock.cpp b/libmysqlpp/my-mock.cpp index fb00ef5..19f2058 100644 --- a/libmysqlpp/my-mock.cpp +++ b/libmysqlpp/my-mock.cpp @@ -6,7 +6,7 @@ NAMEDFACTORY("mysql", MySQL::Mock, DB::MockDatabaseFactory); namespace MySQL { -Mock::Mock(const std::string & master, const std::string & name, const std::vector & ss) : +Mock::Mock(const std::string & master, const std::string & name, const std::vector & ss) : MockServerDatabase(master, name, "mysql") { CreateNewDatabase(); diff --git a/libmysqlpp/my-mock.h b/libmysqlpp/my-mock.h index a1dd770..60aa124 100644 --- a/libmysqlpp/my-mock.h +++ b/libmysqlpp/my-mock.h @@ -2,14 +2,14 @@ #define MOCKMYSQLDATASOURCE_H #include -#include +#include #include namespace MySQL { class DLL_PUBLIC Mock : public DB::MockServerDatabase { public: - Mock(const std::string & master, const std::string & name, const std::vector & ss); + Mock(const std::string & master, const std::string & name, const std::vector & ss); ~Mock(); private: diff --git a/libmysqlpp/unittests/Jamfile.jam b/libmysqlpp/unittests/Jamfile.jam index 89f3182..8752f86 100644 --- a/libmysqlpp/unittests/Jamfile.jam +++ b/libmysqlpp/unittests/Jamfile.jam @@ -3,8 +3,7 @@ import testing ; path-constant me : . ; lib boost_utf : : boost_unit_test_framework ; -lib boost_filesystem ; -lib boost_system ; +lib stdc++fs ; lib dbpptestcore : : : : /usr/include/dbpp ; run @@ -16,8 +15,7 @@ run dbpptestcore ..//adhocutil boost_utf - boost_system - boost_filesystem + stdc++fs mysqlschema.sql : testmysql -- cgit v1.2.3