]>
Commit | Line | Data |
---|---|---|
1 | src/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' | |
5 | BOOST_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' | |
8 | constexpr __ph<1> _1{}; | |
9 | ^ | |
10 | ||
11 | --- CMakeLists.txt.orig 2020-01-30 21:52:36.000000000 +0100 | |
12 | +++ CMakeLists.txt 2020-05-28 16:50:46.412927163 +0200 | |
13 | @@ -563,7 +563,7 @@ | |
14 | set(BOOST_HEADER_COMPONENTS container) | |
15 | ||
16 | if(WITH_MGR) | |
17 | - list(APPEND BOOST_COMPONENTS python) | |
18 | + list(APPEND BOOST_COMPONENTS python27) | |
19 | endif() | |
20 | if(WITH_BOOST_CONTEXT) | |
21 | list(APPEND BOOST_COMPONENTS context coroutine) | |
22 | --- src/CMakeLists.txt.orig 2020-01-30 21:52:36.000000000 +0100 | |
23 | +++ src/CMakeLists.txt 2020-05-28 20:58:47.848974172 +0200 | |
24 | @@ -722,7 +722,7 @@ | |
25 | $<TARGET_OBJECTS:heap_profiler_objs>) | |
26 | target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") | |
27 | target_link_libraries(ceph-mgr osdc client global-static ceph-common | |
28 | - Boost::python ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) | |
29 | + Boost::python27 ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) | |
30 | install(TARGETS ceph-mgr DESTINATION bin) | |
31 | endif (WITH_MGR) | |
32 | ||
33 | --- src/test/librbd/test_mock_Journal.cc.orig 2020-01-30 21:52:36.000000000 +0100 | |
34 | +++ src/test/librbd/test_mock_Journal.cc 2020-05-29 06:26:16.934514447 +0200 | |
35 | @@ -482,7 +482,7 @@ | |
36 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
37 | expect_start_replay( | |
38 | mock_image_ctx, mock_journaler, | |
39 | - std::bind(&invoke_replay_complete, _1, 0)); | |
40 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0)); | |
41 | ||
42 | MockJournalReplay mock_journal_replay; | |
43 | expect_stop_replay(mock_journaler); | |
44 | @@ -531,7 +531,7 @@ | |
45 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
46 | expect_start_replay( | |
47 | mock_image_ctx, mock_journaler, | |
48 | - std::bind(&invoke_replay_ready, _1)); | |
49 | + std::bind(&invoke_replay_ready, std::placeholders::_1)); | |
50 | ||
51 | ::journal::MockReplayEntry mock_replay_entry; | |
52 | MockJournalReplay mock_journal_replay; | |
53 | @@ -540,11 +540,11 @@ | |
54 | expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry); | |
55 | expect_replay_process(mock_journal_replay); | |
56 | expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry, | |
57 | - std::bind(&invoke_replay_ready, _1)); | |
58 | + std::bind(&invoke_replay_ready, std::placeholders::_1)); | |
59 | expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry); | |
60 | expect_replay_process(mock_journal_replay); | |
61 | expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry, | |
62 | - std::bind(&invoke_replay_complete, _1, 0)); | |
63 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0)); | |
64 | ||
65 | expect_stop_replay(mock_journaler); | |
66 | expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0); | |
67 | @@ -601,7 +601,7 @@ | |
68 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
69 | expect_start_replay( | |
70 | mock_image_ctx, mock_journaler, | |
71 | - std::bind(&invoke_replay_complete, _1, -EINVAL)); | |
72 | + std::bind(&invoke_replay_complete, std::placeholders::_1, -EINVAL)); | |
73 | ||
74 | MockJournalReplay mock_journal_replay; | |
75 | expect_stop_replay(mock_journaler); | |
76 | @@ -616,7 +616,7 @@ | |
77 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
78 | expect_start_replay( | |
79 | mock_image_ctx, mock_journaler, | |
80 | - std::bind(&invoke_replay_complete, _1, 0)); | |
81 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0)); | |
82 | ||
83 | expect_stop_replay(mock_journaler); | |
84 | expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0); | |
85 | @@ -649,14 +649,14 @@ | |
86 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
87 | expect_start_replay( | |
88 | mock_image_ctx, mock_journaler, | |
89 | - std::bind(&invoke_replay_ready, _1)); | |
90 | + std::bind(&invoke_replay_ready, std::placeholders::_1)); | |
91 | ||
92 | ::journal::MockReplayEntry mock_replay_entry; | |
93 | MockJournalReplay mock_journal_replay; | |
94 | expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry); | |
95 | expect_replay_process(mock_journal_replay); | |
96 | expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry, | |
97 | - std::bind(&invoke_replay_complete, _1, 0)); | |
98 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0)); | |
99 | expect_stop_replay(mock_journaler); | |
100 | expect_shut_down_replay(mock_image_ctx, mock_journal_replay, -EINVAL); | |
101 | expect_flush_commit_position(mock_journaler); | |
102 | @@ -669,7 +669,7 @@ | |
103 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
104 | expect_start_replay( | |
105 | mock_image_ctx, mock_journaler, | |
106 | - std::bind(&invoke_replay_complete, _1, 0)); | |
107 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0)); | |
108 | ||
109 | expect_stop_replay(mock_journaler); | |
110 | expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0); | |
111 | @@ -702,7 +702,7 @@ | |
112 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
113 | expect_start_replay( | |
114 | mock_image_ctx, mock_journaler, | |
115 | - std::bind(&invoke_replay_ready, _1)); | |
116 | + std::bind(&invoke_replay_ready, std::placeholders::_1)); | |
117 | ||
118 | ::journal::MockReplayEntry mock_replay_entry; | |
119 | MockJournalReplay mock_journal_replay; | |
120 | @@ -720,7 +720,7 @@ | |
121 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
122 | expect_start_replay( | |
123 | mock_image_ctx, mock_journaler, | |
124 | - std::bind(&invoke_replay_complete, _1, 0)); | |
125 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0)); | |
126 | expect_stop_replay(mock_journaler); | |
127 | expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0); | |
128 | expect_flush_commit_position(mock_journaler); | |
129 | @@ -752,7 +752,7 @@ | |
130 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
131 | expect_start_replay( | |
132 | mock_image_ctx, mock_journaler, | |
133 | - std::bind(&invoke_replay_complete, _1, 0)); | |
134 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0)); | |
135 | ||
136 | MockJournalReplay mock_journal_replay; | |
137 | expect_stop_replay(mock_journaler); | |
138 | @@ -786,7 +786,7 @@ | |
139 | ||
140 | expect_start_replay( | |
141 | mock_image_ctx, mock_journaler, | |
142 | - std::bind(&invoke_replay_ready, _1)); | |
143 | + std::bind(&invoke_replay_ready, std::placeholders::_1)); | |
144 | ||
145 | ::journal::MockReplayEntry mock_replay_entry; | |
146 | MockJournalReplay mock_journal_replay; | |
147 | @@ -813,7 +813,7 @@ | |
148 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
149 | expect_start_replay( | |
150 | mock_image_ctx, mock_journaler, { | |
151 | - std::bind(&invoke_replay_complete, _1, 0) | |
152 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0) | |
153 | }); | |
154 | ||
155 | expect_stop_replay(mock_journaler); | |
156 | @@ -868,14 +868,14 @@ | |
157 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
158 | expect_start_replay( | |
159 | mock_image_ctx, mock_journaler, | |
160 | - std::bind(&invoke_replay_ready, _1)); | |
161 | + std::bind(&invoke_replay_ready, std::placeholders::_1)); | |
162 | ||
163 | ::journal::MockReplayEntry mock_replay_entry; | |
164 | MockJournalReplay mock_journal_replay; | |
165 | expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry); | |
166 | expect_replay_process(mock_journal_replay); | |
167 | expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry, | |
168 | - std::bind(&invoke_replay_complete, _1, 0)); | |
169 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0)); | |
170 | expect_stop_replay(mock_journaler); | |
171 | ||
172 | Context *on_flush = nullptr; | |
173 | @@ -892,7 +892,7 @@ | |
174 | expect_get_max_append_size(mock_journaler, 1 << 16); | |
175 | expect_start_replay( | |
176 | mock_image_ctx, mock_journaler, | |
177 | - std::bind(&invoke_replay_complete, _1, 0)); | |
178 | + std::bind(&invoke_replay_complete, std::placeholders::_1, 0)); | |
179 | ||
180 | expect_stop_replay(mock_journaler); | |
181 | expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0); | |
182 | --- src/test/lazy-omap-stats/lazy_omap_stats_test.cc.orig 2020-01-30 21:52:36.000000000 +0100 | |
183 | +++ src/test/lazy-omap-stats/lazy_omap_stats_test.cc 2020-05-29 08:04:42.179189658 +0200 | |
184 | @@ -331,7 +331,7 @@ | |
185 | vector<string> tokens(tok.begin(), tok.end()); | |
186 | auto it = find(tokens.begin(), tokens.end(), label); | |
187 | if (it != tokens.end()) { | |
188 | - return distance(tokens.begin(), it); | |
189 | + return std::distance(tokens.begin(), it); | |
190 | } | |
191 | ||
192 | cerr << "find_index failed to find index for " << label << endl; |