mirror of https://github.com/microsoft/vcpkg.git
[foonathan-memory] Backport operator literal syntax fix (#50018)
This commit is contained in:
parent
e5938f85e3
commit
d00e3ca409
|
|
@ -0,0 +1,43 @@
|
|||
diff --git a/include/foonathan/memory/memory_arena.hpp b/include/foonathan/memory/memory_arena.hpp
|
||||
index 30ddd68..be2de58 100644
|
||||
--- a/include/foonathan/memory/memory_arena.hpp
|
||||
+++ b/include/foonathan/memory/memory_arena.hpp
|
||||
@@ -656,32 +656,32 @@ namespace foonathan
|
||||
/// \returns The number of bytes `value` is in the given unit.
|
||||
/// \ingroup core
|
||||
/// @{
|
||||
- constexpr std::size_t operator"" _KiB(unsigned long long value) noexcept
|
||||
+ constexpr std::size_t operator""_KiB(unsigned long long value) noexcept
|
||||
{
|
||||
return std::size_t(value * 1024);
|
||||
}
|
||||
|
||||
- constexpr std::size_t operator"" _KB(unsigned long long value) noexcept
|
||||
+ constexpr std::size_t operator""_KB(unsigned long long value) noexcept
|
||||
{
|
||||
return std::size_t(value * 1000);
|
||||
}
|
||||
|
||||
- constexpr std::size_t operator"" _MiB(unsigned long long value) noexcept
|
||||
+ constexpr std::size_t operator""_MiB(unsigned long long value) noexcept
|
||||
{
|
||||
return std::size_t(value * 1024 * 1024);
|
||||
}
|
||||
|
||||
- constexpr std::size_t operator"" _MB(unsigned long long value) noexcept
|
||||
+ constexpr std::size_t operator""_MB(unsigned long long value) noexcept
|
||||
{
|
||||
return std::size_t(value * 1000 * 1000);
|
||||
}
|
||||
|
||||
- constexpr std::size_t operator"" _GiB(unsigned long long value) noexcept
|
||||
+ constexpr std::size_t operator""_GiB(unsigned long long value) noexcept
|
||||
{
|
||||
return std::size_t(value * 1024 * 1024 * 1024);
|
||||
}
|
||||
|
||||
- constexpr std::size_t operator"" _GB(unsigned long long value) noexcept
|
||||
+ constexpr std::size_t operator""_GB(unsigned long long value) noexcept
|
||||
{
|
||||
return std::size_t(value * 1000 * 1000 * 1000);
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@ vcpkg_from_github(
|
|||
HEAD_REF master
|
||||
PATCHES
|
||||
config-debug.diff
|
||||
backport-0f5ebe9f.diff # Fix deprecated literal operator syntax
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "foonathan-memory",
|
||||
"version": "0.7.4",
|
||||
"port-version": 1,
|
||||
"description": "STL compatible C++ memory allocator library",
|
||||
"homepage": "https://foonathan.net/doc/memory/",
|
||||
"license": "Zlib",
|
||||
|
|
|
|||
|
|
@ -3134,7 +3134,7 @@
|
|||
},
|
||||
"foonathan-memory": {
|
||||
"baseline": "0.7.4",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"forge": {
|
||||
"baseline": "1.0.8",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d2f4d8463335bfe034de2bc766360292aa198856",
|
||||
"version": "0.7.4",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "b7f3ed99ac6090ee83925ba9a5da9582e84ffc25",
|
||||
"version": "0.7.4",
|
||||
|
|
|
|||
Loading…
Reference in New Issue