summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Thies2023-09-01 21:31:21 +0200
committerMichael Thies2023-09-01 21:31:21 +0200
commit4fa26ef3e2c80aa30caa4bca77d8ed82ad72d506 (patch)
tree5cca94dee04c5990bab51feb84db72c0ffa1a342
parent0cc56c1b16ae70757e7239c7110b0827dd029a8b (diff)
downloadaur-4fa26ef3e2c80aa30caa4bca77d8ed82ad72d506.tar.gz
Remove left-over patch file
-rw-r--r--nlohmann-basic_json-fmt.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/nlohmann-basic_json-fmt.patch b/nlohmann-basic_json-fmt.patch
deleted file mode 100644
index f4cce4b929d7..000000000000
--- a/nlohmann-basic_json-fmt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --unified --recursive justbuild-1.2.0/src/utils/cpp/json.hpp justbuild-1.2.0.new/src/utils/cpp/json.hpp
---- justbuild-1.2.0/src/utils/cpp/json.hpp 2023-08-25 10:37:05.000000000 +0200
-+++ justbuild-1.2.0.new/src/utils/cpp/json.hpp 2023-08-27 18:43:00.957940777 +0200
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unordered_map>
-
-+#include "fmt/ostream.h"
- #include "gsl/gsl"
- #include "nlohmann/json.hpp"
- #include "src/utils/cpp/gsl.hpp"
-@@ -212,4 +213,10 @@
- return old_abbrev;
- }
-
-+// Use nlohmann::basic_json's operator<<() for formatting via libfmt.
-+// This explicit template specialization seems to be required, starting with
-+// libfmt 10.x
-+template <>
-+struct fmt::formatter<nlohmann::basic_json<>> : ostream_formatter {};
-+
- #endif // INCLUDED_SRC_UTILS_CPP_JSON_HPP