1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +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:
Petr Vaněk
2025-02-12 14:06:51 +01:00
committed by Leonid Fedorov
parent ef0647b74a
commit 86159cc899
15 changed files with 48 additions and 20 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"