summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar liamwhite2023-05-28 16:33:42 -0400
committerGravatar GitHub2023-05-28 16:33:42 -0400
commit53fd08b360a393af2e6bfdddc5c549492fcb40bf (patch)
tree6b1ef1f95a8573efe8e239828d10aa65355f780f
parentMerge pull request #10475 from ameerj/microprofile-workaround (diff)
parentCMakeLists: Rollback minimum to fmt 9 (diff)
downloadyuzu-53fd08b360a393af2e6bfdddc5c549492fcb40bf.tar.gz
yuzu-53fd08b360a393af2e6bfdddc5c549492fcb40bf.tar.xz
yuzu-53fd08b360a393af2e6bfdddc5c549492fcb40bf.zip
Merge pull request #10484 from Morph1984/fmt10
externals: Update to fmt 10 and add format_as formatter for BitField
m---------externals/vcpkg0
-rw-r--r--src/common/bit_field.h5
-rw-r--r--vcpkg.json4
3 files changed, 7 insertions, 2 deletions
diff --git a/externals/vcpkg b/externals/vcpkg
Subproject a7b6122f6b6504d16d96117336a056269357993 Subproject 656fcc6ab2b05c6d999b7eaca717027ac3738f7
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index e4e58ea45..0168ff9cb 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -188,3 +188,8 @@ private:
188 188
189template <std::size_t Position, std::size_t Bits, typename T> 189template <std::size_t Position, std::size_t Bits, typename T>
190using BitFieldBE = BitField<Position, Bits, T, BETag>; 190using BitFieldBE = BitField<Position, Bits, T, BETag>;
191
192template <std::size_t Position, std::size_t Bits, typename T, typename EndianTag = LETag>
193inline auto format_as(BitField<Position, Bits, T, EndianTag> bitfield) {
194 return bitfield.Value();
195}
diff --git a/vcpkg.json b/vcpkg.json
index 19f99e89e..26f545c6c 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,7 +1,7 @@
1{ 1{
2 "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", 2 "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
3 "name": "yuzu", 3 "name": "yuzu",
4 "builtin-baseline": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7", 4 "builtin-baseline": "656fcc6ab2b05c6d999b7eaca717027ac3738f71",
5 "version": "1.0", 5 "version": "1.0",
6 "dependencies": [ 6 "dependencies": [
7 "boost-algorithm", 7 "boost-algorithm",
@@ -53,7 +53,7 @@
53 }, 53 },
54 { 54 {
55 "name": "fmt", 55 "name": "fmt",
56 "version": "9.0.0" 56 "version": "10.0.0"
57 } 57 }
58 ] 58 ]
59} 59}