Merge branch 'fix_deprecated_boost_basename' into 'master'

boost: Fix deprecated use of filesystem::basename, use filesystem::path instead Closes #266 See merge request sfcgal/SFCGAL!312
Oslandia · Apr 30, 2024 · 5712f42 · 5712f42
2 parents 765bb65 + 1a7e021
commit 5712f42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,6 @@
 1.5.2 (2024-03-XX):
     * Expose as_vtk to C Api (Loïc Bartoletti)
+    * Fix build with boost 1.85 (Dirk Stöcker, Fixes #266)
 1.5.1 (2023-12-21):
     * Rewrite and fix visibility algorithm (Loïc Bartoletti)
     * Apply clang-tidy fixes (Loïc Bartoletti)

diff --git a/test/regress/standalone/SFCGAL/StraightSkeletonTest.cpp b/test/regress/standalone/SFCGAL/StraightSkeletonTest.cpp
@@ -1,4 +1,4 @@
-/**
+ /**
  *   SFCGAL
  *
  *   Copyright (C) 2012-2013 Oslandia <[email protected]>
@@ -60,7 +60,7 @@ runTest(const boost::filesystem::path::string_type &filename)
   BOOST_REQUIRE(ifs.good());
 
   std::string       line;
-  std::string const lbl_base = boost::filesystem::basename(filename);
+  std::string const lbl_base = boost::filesystem::path(filename).filename().string();
 
   int lineno = 0;
   while (std::getline(ifs, line)) {