mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2025-07-09 19:12:15 +02:00
Compare commits
No commits in common. "9eb92f37dba7840031760838ff6bdf7c54b7ac7b" and "c41a6b80d75c313d56ee3f481c015823f1e1225d" have entirely different histories.
9eb92f37db
...
c41a6b80d7
@ -6,7 +6,7 @@
|
|||||||
[subrepo]
|
[subrepo]
|
||||||
remote = https://github.com/Atmosphere-NX/Atmosphere-libs
|
remote = https://github.com/Atmosphere-NX/Atmosphere-libs
|
||||||
branch = master
|
branch = master
|
||||||
commit = d58ff30a12e447141336befd39f56ce14c3e73d1
|
commit = 087f682571631d5d8734dd994b6caa3e96b8e07c
|
||||||
parent = 5b135d12ca574c8493cd88c9405ad860d040e4a2
|
parent = 05fde7b7644228385df6feb7347e309926da6fc6
|
||||||
method = merge
|
method = merge
|
||||||
cmdver = 0.4.1
|
cmdver = 0.4.1
|
||||||
|
@ -42,7 +42,7 @@ namespace ams::sf {
|
|||||||
} else if constexpr(TransferMode == BufferTransferMode::AutoSelect) {
|
} else if constexpr(TransferMode == BufferTransferMode::AutoSelect) {
|
||||||
return SfBufferAttr_HipcAutoSelect;
|
return SfBufferAttr_HipcAutoSelect;
|
||||||
} else {
|
} else {
|
||||||
static_assert(false, "Invalid BufferTransferMode");
|
static_assert(TransferMode != TransferMode, "Invalid BufferTransferMode");
|
||||||
}
|
}
|
||||||
}();
|
}();
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ namespace ams::sf {
|
|||||||
private:
|
private:
|
||||||
struct Holder {
|
struct Holder {
|
||||||
MemoryResource *allocator;
|
MemoryResource *allocator;
|
||||||
alignas(alignof(T)) std::byte storage[sizeof(T)];
|
typename std::aligned_storage<sizeof(T), alignof(T)>::type storage;
|
||||||
};
|
};
|
||||||
public:
|
public:
|
||||||
void *Allocate(size_t size) {
|
void *Allocate(size_t size) {
|
||||||
|
@ -57,7 +57,7 @@ namespace ams::sf {
|
|||||||
|
|
||||||
struct Globals {
|
struct Globals {
|
||||||
ExpHeapAllocator allocator;
|
ExpHeapAllocator allocator;
|
||||||
alignas(0x10) std::byte buffer[Size == 0 ? 1 : Size];
|
typename std::aligned_storage<Size == 0 ? 1 : Size>::type buffer;
|
||||||
};
|
};
|
||||||
|
|
||||||
static constinit inline Globals _globals = {};
|
static constinit inline Globals _globals = {};
|
||||||
|
Loading…
Reference in New Issue
Block a user