RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48629 from SUSE/wip-fix-neorados-fmt9

Browse Source 
neorados: compile with fmt v9

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
This commit is contained in:
Tim Serong 2022-10-28 10:05:49 +11:00 committed by GitHub
commit f6dc0beb5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/include/neorados/RADOS_Decodable.hpp
View File

@ -24,6 +24,11 @@
#include <utility>
#include <vector>
#include <fmt/core.h>
#if FMT_VERSION >= 90000
#include <fmt/ostream.h>
#endif
namespace neorados {
struct Entry {
std::string nspace;
@ -104,4 +109,8 @@ struct hash<::neorados::Entry> {
};
}
#if FMT_VERSION >= 90000
template <> struct fmt::formatter<neorados::Entry> : ostream_formatter {};
#endif
#endif // RADOS_DECODABLE_HPP

4
src/tools/neorados.cc
View File

@ -293,6 +293,10 @@ const std::array commands = {
"remove OBJECT in POOL"sv }
};
#if FMT_VERSION >= 90000
template <> struct fmt::formatter<boost::program_options::options_description> : ostream_formatter {};
#endif // FMT_VERSION
int main(int argc, char* argv[])
{
const std::string_view prog(argv[0]);