You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-08-05 16:15:50 +03:00
Migration for Boost 1.85
Boost 1.85 removed some deprecated code in filesystem module which is still used in columnstore: - The boost/filesystem/convenience.hpp was removed but columnstore does not use any functionality from that file except indirect includes. Therefore this include is removed or replaced with more general boost/filesystem.hpp. The convenience.hpp header file was deprecated in filesystem V3 introduced in Boost 1.46.0. - `normalize` method was removed and users are suggested to replace it with `lexically_normal` method, which was introduced in Boost 1.60.0. Original `normalize` call is preserved for backward compatibility with old Boost version, however`, `lexically_normal` method is preferably used with Boost 1.60.0 and newer. - The `copy_option` was removed in favor of `copy_options` (note the trailing 's'), but enum values were renamed. Namely, `fail_if_exists` is replaced with `none` and `overwrite_if_exists` is replaced with `overwrite_existing`. The `copy_options` was introduced in Boost 1.74.0. New form is used instead, but a backward compatibility layer for Boost 1.73.0 and older was introduced in boost_copy_options_compat.hpp file. This solution seems to be less awkward than using multiple #if #else #endif blocks in source code.
This commit is contained in:
committed by
Leonid Fedorov
parent
ef0647b74a
commit
86159cc899
@@ -34,8 +34,7 @@
|
||||
#include <string.h>
|
||||
#include <vector>
|
||||
#include <sstream>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/convenience.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/uuid/uuid.hpp>
|
||||
#include <boost/uuid/uuid_generators.hpp>
|
||||
#include <pwd.h>
|
||||
|
@@ -32,8 +32,7 @@ using namespace std;
|
||||
#include "boost/scoped_ptr.hpp"
|
||||
#include "boost/scoped_array.hpp"
|
||||
#include "boost/thread/mutex.hpp"
|
||||
#include "boost/filesystem/path.hpp"
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
#include "boost/filesystem.hpp"
|
||||
using namespace boost;
|
||||
|
||||
#include "installdir.h"
|
||||
|
@@ -19,8 +19,7 @@
|
||||
// $Id: we_ddlcommandproc.cpp 3082 2011-09-26 22:00:38Z chao $
|
||||
|
||||
#include <unistd.h>
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
#include "boost/filesystem/path.hpp"
|
||||
#include "boost/filesystem.hpp"
|
||||
#include "boost/scoped_ptr.hpp"
|
||||
using namespace std;
|
||||
|
||||
|
@@ -24,7 +24,6 @@
|
||||
#include <sstream>
|
||||
#include <boost/scoped_array.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/convenience.hpp>
|
||||
|
||||
#include "we_define.h"
|
||||
#include "we_fileop.h"
|
||||
|
@@ -20,7 +20,6 @@
|
||||
#include <sstream>
|
||||
#include <boost/scoped_array.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/convenience.hpp>
|
||||
|
||||
#include "we_define.h"
|
||||
#include "we_fileop.h"
|
||||
|
@@ -30,7 +30,6 @@
|
||||
#include <boost/scoped_array.hpp>
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/convenience.hpp>
|
||||
|
||||
#include "we_bulkrollbackmgr.h"
|
||||
|
||||
|
@@ -26,7 +26,6 @@
|
||||
#include <sstream>
|
||||
#include <unistd.h>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/convenience.hpp>
|
||||
|
||||
#include "we_config.h"
|
||||
#include "we_convertor.h"
|
||||
|
@@ -36,8 +36,7 @@
|
||||
#include "we_convertor.h"
|
||||
#include "dataconvert.h"
|
||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/convenience.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
|
||||
#include <sys/time.h>
|
||||
|
||||
|
Reference in New Issue
Block a user