]> git.pld-linux.org Git - packages/ceph.git/blame - boost.patch
projects / packages / ceph.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- up to 14.2.22
[packages/ceph.git] / boost.patch
CommitLineData
c1965bc2
JP		 1src/test/librbd/test_mock_Journal.cc:485:42: error: reference to '_1' is ambiguous
2 std::bind(&invoke_replay_complete, _1, 0));
3 ^
4/usr/local/include/boost/bind/placeholders.hpp:46:38: note: candidate found by name lookup is 'boost::placeholders::_1'
5BOOST_STATIC_CONSTEXPR boost::arg<1> _1;
6 ^
7/usr/include/c++/v1/functional:2021:21: note: candidate found by name lookup is 'std::__1::placeholders::_1'
8constexpr __ph<1> _1{};
9 ^
10
1b11728e
JB		 11--- src/test/librbd/test_mock_Journal.cc.orig 2020-01-30 21:52:36.000000000 +0100
12+++ src/test/librbd/test_mock_Journal.cc 2020-05-29 06:26:16.934514447 +0200
13@@ -482,7 +482,7 @@
14 expect_get_max_append_size(mock_journaler, 1 << 16);
15 expect_start_replay(
16 mock_image_ctx, mock_journaler,
17- std::bind(&invoke_replay_complete, _1, 0));
18+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
19
20 MockJournalReplay mock_journal_replay;
21 expect_stop_replay(mock_journaler);
22@@ -531,7 +531,7 @@
23 expect_get_max_append_size(mock_journaler, 1 << 16);
24 expect_start_replay(
25 mock_image_ctx, mock_journaler,
26- std::bind(&invoke_replay_ready, _1));
27+ std::bind(&invoke_replay_ready, std::placeholders::_1));
28
29 ::journal::MockReplayEntry mock_replay_entry;
30 MockJournalReplay mock_journal_replay;
31@@ -540,11 +540,11 @@
32 expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
33 expect_replay_process(mock_journal_replay);
34 expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
35- std::bind(&invoke_replay_ready, _1));
36+ std::bind(&invoke_replay_ready, std::placeholders::_1));
37 expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
38 expect_replay_process(mock_journal_replay);
39 expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
40- std::bind(&invoke_replay_complete, _1, 0));
41+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
42
43 expect_stop_replay(mock_journaler);
44 expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
45@@ -601,7 +601,7 @@
46 expect_get_max_append_size(mock_journaler, 1 << 16);
47 expect_start_replay(
48 mock_image_ctx, mock_journaler,
49- std::bind(&invoke_replay_complete, _1, -EINVAL));
50+ std::bind(&invoke_replay_complete, std::placeholders::_1, -EINVAL));
51
52 MockJournalReplay mock_journal_replay;
53 expect_stop_replay(mock_journaler);
54@@ -616,7 +616,7 @@
55 expect_get_max_append_size(mock_journaler, 1 << 16);
56 expect_start_replay(
57 mock_image_ctx, mock_journaler,
58- std::bind(&invoke_replay_complete, _1, 0));
59+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
60
61 expect_stop_replay(mock_journaler);
62 expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
63@@ -649,14 +649,14 @@
64 expect_get_max_append_size(mock_journaler, 1 << 16);
65 expect_start_replay(
66 mock_image_ctx, mock_journaler,
67- std::bind(&invoke_replay_ready, _1));
68+ std::bind(&invoke_replay_ready, std::placeholders::_1));
69
70 ::journal::MockReplayEntry mock_replay_entry;
71 MockJournalReplay mock_journal_replay;
72 expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
73 expect_replay_process(mock_journal_replay);
74 expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
75- std::bind(&invoke_replay_complete, _1, 0));
76+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
77 expect_stop_replay(mock_journaler);
78 expect_shut_down_replay(mock_image_ctx, mock_journal_replay, -EINVAL);
79 expect_flush_commit_position(mock_journaler);
80@@ -669,7 +669,7 @@
81 expect_get_max_append_size(mock_journaler, 1 << 16);
82 expect_start_replay(
83 mock_image_ctx, mock_journaler,
84- std::bind(&invoke_replay_complete, _1, 0));
85+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
86
87 expect_stop_replay(mock_journaler);
88 expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
89@@ -702,7 +702,7 @@
90 expect_get_max_append_size(mock_journaler, 1 << 16);
91 expect_start_replay(
92 mock_image_ctx, mock_journaler,
93- std::bind(&invoke_replay_ready, _1));
94+ std::bind(&invoke_replay_ready, std::placeholders::_1));
95
96 ::journal::MockReplayEntry mock_replay_entry;
97 MockJournalReplay mock_journal_replay;
98@@ -720,7 +720,7 @@
99 expect_get_max_append_size(mock_journaler, 1 << 16);
100 expect_start_replay(
101 mock_image_ctx, mock_journaler,
102- std::bind(&invoke_replay_complete, _1, 0));
103+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
104 expect_stop_replay(mock_journaler);
105 expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
106 expect_flush_commit_position(mock_journaler);
107@@ -752,7 +752,7 @@
108 expect_get_max_append_size(mock_journaler, 1 << 16);
109 expect_start_replay(
110 mock_image_ctx, mock_journaler,
111- std::bind(&invoke_replay_complete, _1, 0));
112+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
113
114 MockJournalReplay mock_journal_replay;
115 expect_stop_replay(mock_journaler);
116@@ -786,7 +786,7 @@
117
118 expect_start_replay(
119 mock_image_ctx, mock_journaler,
120- std::bind(&invoke_replay_ready, _1));
121+ std::bind(&invoke_replay_ready, std::placeholders::_1));
122
123 ::journal::MockReplayEntry mock_replay_entry;
124 MockJournalReplay mock_journal_replay;
125@@ -813,7 +813,7 @@
126 expect_get_max_append_size(mock_journaler, 1 << 16);
127 expect_start_replay(
128 mock_image_ctx, mock_journaler, {
129- std::bind(&invoke_replay_complete, _1, 0)
130+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0)
131 });
132
133 expect_stop_replay(mock_journaler);
134@@ -868,14 +868,14 @@
135 expect_get_max_append_size(mock_journaler, 1 << 16);
136 expect_start_replay(
137 mock_image_ctx, mock_journaler,
138- std::bind(&invoke_replay_ready, _1));
139+ std::bind(&invoke_replay_ready, std::placeholders::_1));
140
141 ::journal::MockReplayEntry mock_replay_entry;
142 MockJournalReplay mock_journal_replay;
143 expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
144 expect_replay_process(mock_journal_replay);
145 expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
146- std::bind(&invoke_replay_complete, _1, 0));
147+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
148 expect_stop_replay(mock_journaler);
149
150 Context *on_flush = nullptr;
151@@ -892,7 +892,7 @@
152 expect_get_max_append_size(mock_journaler, 1 << 16);
153 expect_start_replay(
154 mock_image_ctx, mock_journaler,
155- std::bind(&invoke_replay_complete, _1, 0));
156+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
157
158 expect_stop_replay(mock_journaler);
159 expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
160--- src/test/lazy-omap-stats/lazy_omap_stats_test.cc.orig 2020-01-30 21:52:36.000000000 +0100
161+++ src/test/lazy-omap-stats/lazy_omap_stats_test.cc 2020-05-29 08:04:42.179189658 +0200
162@@ -331,7 +331,7 @@
163 vector<string> tokens(tok.begin(), tok.end());
164 auto it = find(tokens.begin(), tokens.end(), label);
165 if (it != tokens.end()) {
166- return distance(tokens.begin(), it);
167+ return std::distance(tokens.begin(), it);
168 }
169
170 cerr << "find_index failed to find index for " << label << endl;
User space components of the Ceph file system
This page took 0.128355 seconds and 4 git commands to generate.