contrib/rstudio/rstudio-1.2.1335-boost-1.72-filesystem.patch

32 lines
1.0 KiB
Diff

From a11d0454e5fe9c50005a03b9d9de84355df5c7fd Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Fri, 15 Nov 2019 14:54:02 -0800
Subject: [PATCH] avoid use of deprecated APIs
---
src/cpp/core/FilePath.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/cpp/shared_core/FilePath.cpp b/src/cpp/shared_core/FilePath.cpp
index 088366a9d6..495289e7fc 100644
--- a/src/cpp/core/FilePath.cpp
+++ b/src/cpp/core/FilePath.cpp
@@ -22,8 +22,6 @@
#include <windows.h>
#endif
-#define BOOST_FILESYSTEM_NO_DEPRECATED
-
#define BOOST_NO_CXX11_SCOPED_ENUMS
#include <boost/filesystem.hpp>
#undef BOOST_NO_CXX11_SCOPED_ENUMS
@@ -1032,7 +1030,7 @@
{
// NOTE: The path gets round-tripped through toString/fromString, would
// be nice to have a direct constructor
- if (!iterationFunction(itr.level(),
+ if (!iterationFunction(itr.depth(),
FilePath(BOOST_FS_PATH2STR(itr->path()))))
{
// end the iteration if requested