tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From a8a7f4460b8f46ca752389f3e1fa43b5c95f2bac Mon Sep 17 00:00:00 2001
2From: Emily <hello@emily.moe>
3Date: Thu, 28 Nov 2024 05:56:34 +0000
4Subject: [PATCH] Remove use of deprecated `<boost/filesystem/convenience.hpp>`
5
6This header was dropped in Boost 1.85.
7---
8 client_generic/Client/Player.cpp | 3 ---
9 client_generic/Client/lua_playlist.h | 3 ---
10 client_generic/ContentDecoder/graph_playlist.h | 4 +---
11 client_generic/TupleStorage/luastorage.cpp | 3 ---
12 4 files changed, 1 insertion(+), 12 deletions(-)
13
14diff --git a/client_generic/Client/Player.cpp b/client_generic/Client/Player.cpp
15index 1f65d761..9726b014 100644
16--- a/client_generic/Client/Player.cpp
17+++ b/client_generic/Client/Player.cpp
18@@ -60,7 +60,6 @@
19
20 #include "boost/filesystem/path.hpp"
21 #include "boost/filesystem/operations.hpp"
22-#include "boost/filesystem/convenience.hpp"
23
24 #if defined(MAC) || defined(WIN32)
25 #define HONOR_VBL_SYNC
26@@ -68,8 +67,6 @@
27
28 using boost::filesystem::path;
29 using boost::filesystem::exists;
30-using boost::filesystem::directory_iterator;
31-using boost::filesystem::extension;
32
33 using namespace DisplayOutput;
34
35diff --git a/client_generic/Client/lua_playlist.h b/client_generic/Client/lua_playlist.h
36index fbe5a333..511c86ee 100644
37--- a/client_generic/Client/lua_playlist.h
38+++ b/client_generic/Client/lua_playlist.h
39@@ -17,13 +17,10 @@
40
41 #include "boost/filesystem/path.hpp"
42 #include "boost/filesystem/operations.hpp"
43-#include "boost/filesystem/convenience.hpp"
44 #include <boost/thread.hpp>
45
46 using boost::filesystem::path;
47 using boost::filesystem::exists;
48-using boost::filesystem::directory_iterator;
49-using boost::filesystem::extension;
50
51
52 // Lua.
53diff --git a/client_generic/ContentDecoder/graph_playlist.h b/client_generic/ContentDecoder/graph_playlist.h
54index 1f0a6cd0..cc2672e2 100644
55--- a/client_generic/ContentDecoder/graph_playlist.h
56+++ b/client_generic/ContentDecoder/graph_playlist.h
57@@ -13,13 +13,11 @@
58
59 #include "boost/filesystem/path.hpp"
60 #include "boost/filesystem/operations.hpp"
61-#include "boost/filesystem/convenience.hpp"
62
63 using boost::filesystem::path;
64 using boost::filesystem::exists;
65 using boost::filesystem::no_check;
66 using boost::filesystem::directory_iterator;
67-using boost::filesystem::extension;
68
69 namespace ContentDecoder
70 {
71@@ -116,7 +114,7 @@ class CGraphPlaylist : public CPlaylist
72 for( directory_iterator i( _dir ), end; i != end; ++i )
73 {
74 #warning TODO (Keffo#1#): Remove hardcoded extension...
75- if( extension(*i) != ".avi" )
76+ if( i->extension().string() != ".avi" )
77 continue;
78
79 std::string file = i->string();
80diff --git a/client_generic/TupleStorage/luastorage.cpp b/client_generic/TupleStorage/luastorage.cpp
81index efbe8867..9b2ffa93 100644
82--- a/client_generic/TupleStorage/luastorage.cpp
83+++ b/client_generic/TupleStorage/luastorage.cpp
84@@ -9,12 +9,9 @@
85
86 #include "boost/filesystem/path.hpp"
87 #include "boost/filesystem/operations.hpp"
88-#include "boost/filesystem/convenience.hpp"
89
90 using boost::filesystem::path;
91 using boost::filesystem::exists;
92-using boost::filesystem::directory_iterator;
93-using boost::filesystem::extension;
94
95 using namespace std;
96