diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-02-03 20:22:09 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-02-03 20:22:09 +0000 |
| commit | fb430942bf82a2e14f1d06dbf09a71a70ba10a8e (patch) | |
| tree | f59c5116cf8e145d80f117866cfbc090a49b5448 | |
| parent | Update to new PluginMock interface (diff) | |
| download | libdbpp-mysql-fb430942bf82a2e14f1d06dbf09a71a70ba10a8e.tar.bz2 libdbpp-mysql-fb430942bf82a2e14f1d06dbf09a71a70ba10a8e.tar.xz libdbpp-mysql-fb430942bf82a2e14f1d06dbf09a71a70ba10a8e.zip | |
Remove boost::filesystem in favour of std::filesystem
| -rw-r--r-- | libmysqlpp/Jamfile.jam | 2 | ||||
| -rw-r--r-- | libmysqlpp/my-mock.cpp | 2 | ||||
| -rw-r--r-- | libmysqlpp/my-mock.h | 4 | ||||
| -rw-r--r-- | 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 : : : : <include>/usr/include/mysql ; lib adhocutil : : : : <include>/usr/include/adhocutil ; lib dbppcore : : : : <include>/usr/include/dbpp ; lib boost_date_time ; -lib boost_system ; lib dbpp-mysql : [ glob my-*.cpp ] : @@ -13,7 +12,6 @@ lib dbpp-mysql : <library>dbppcore <library>adhocutil <library>boost_date_time - <library>boost_system : : <include>. <library>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<boost::filesystem::path> & ss) : +Mock::Mock(const std::string & master, const std::string & name, const std::vector<std::filesystem::path> & 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 <mockDatabase.h> -#include <boost/filesystem/path.hpp> +#include <filesystem> #include <visibility.h> namespace MySQL { class DLL_PUBLIC Mock : public DB::MockServerDatabase { public: - Mock(const std::string & master, const std::string & name, const std::vector<boost::filesystem::path> & ss); + Mock(const std::string & master, const std::string & name, const std::vector<std::filesystem::path> & 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 : : <name>boost_unit_test_framework ; -lib boost_filesystem ; -lib boost_system ; +lib stdc++fs ; lib dbpptestcore : : : : <include>/usr/include/dbpp ; run @@ -16,8 +15,7 @@ run <library>dbpptestcore <library>..//adhocutil <library>boost_utf - <library>boost_system - <library>boost_filesystem + <library>stdc++fs <dependency>mysqlschema.sql : testmysql |