You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-08-02 17:46:37 +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
@ -54,6 +54,7 @@ namespace fs = boost::filesystem;
|
||||
|
||||
#include "configcpp.h"
|
||||
|
||||
#include "boost_copy_options_compat.hpp"
|
||||
#include "exceptclasses.h"
|
||||
#include "installdir.h"
|
||||
#ifdef _MSC_VER
|
||||
@ -401,7 +402,7 @@ void Config::writeConfig(const string& configFile) const
|
||||
{
|
||||
}
|
||||
|
||||
fs::copy_file(dcf, scft, fs::copy_option::overwrite_if_exists);
|
||||
fs::copy_file(dcf, scft, fs::copy_options::overwrite_existing);
|
||||
|
||||
try
|
||||
{
|
||||
|
Reference in New Issue
Block a user