Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-02-20 01:41:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix clang 13 compatibility

Browse Source 
Signed-off-by: Сергей Исаков <sergey@iMac2017.local>
This commit is contained in:
Сергей Исаков 2022-08-12 22:09:53 +03:00
parent 3fa603faa8
commit 2313e8bac9
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rEFIt_UEFI/Platform/smbios.cpp
View File

@ -104,7 +104,11 @@ MEM_STRUCTURE gRAM;
#define SMBIOS_PTR SIGNATURE_32('_','S','M','_') #define SMBIOS_PTR SIGNATURE_32('_','S','M','_')
#define MAX_TABLE_SIZE 512 #define MAX_TABLE_SIZE 512
#define smbios_offsetof(s,m) ( (SMBIOS_TABLE_STRING) ((UINT8*)&((s*)0)->m - (UINT8*)0)) //#define smbios_offsetof(s,m) ( (SMBIOS_TABLE_STRING) ((UINT8*)&((s*)0)->m - (UINT8*)0))
#ifndef smbios_offsetof
# define smbios_offsetof(TYPE, MEMBER) ((SMBIOS_TABLE_STRING)((size_t) &((TYPE *)0)->MEMBER))
#endif
SMBIOS_TABLE_STRING SMBIOS_TABLE_TYPE0_STR_IDX[] = { SMBIOS_TABLE_STRING SMBIOS_TABLE_TYPE0_STR_IDX[] = {
smbios_offsetof(SMBIOS_TABLE_TYPE0, Vendor), smbios_offsetof(SMBIOS_TABLE_TYPE0, Vendor),

8
rEFIt_UEFI/cpp_foundation/XStringAbstract.h
View File

@ -33,7 +33,7 @@
template<typename S, typename O> template<typename S, typename O>
int XStringAbstract__startWith(const S* src, const O* other, bool ignoreCase) int XStringAbstract__startWith(const S* src, const O* other, bool ignoreCase)
{ {
size_t nb = 0; // size_t nb = 0;
const S* src2 = src; const S* src2 = src;
const O* other2 = other; const O* other2 = other;
@ -50,7 +50,7 @@ int XStringAbstract__startWith(const S* src, const O* other, bool ignoreCase)
if ( src_char32 != other_char32 ) return false; if ( src_char32 != other_char32 ) return false;
src2 = get_char32_from_string(src2, &src_char32); src2 = get_char32_from_string(src2, &src_char32);
other2 = get_char32_from_string(other2, &other_char32); other2 = get_char32_from_string(other2, &other_char32);
nb += 1; // nb += 1;
}; };
return src_char32 != 0; return src_char32 != 0;
} }
@ -89,7 +89,7 @@ int XStringAbstract__compare(const S* src, const O* other, bool ignoreCase)
if ( other == NULL || *other == 0 ) return 1; if ( other == NULL || *other == 0 ) return 1;
// size_t len_s = length_of_utf_string(src); // size_t len_s = length_of_utf_string(src);
// size_t len_other = length_of_utf_string(other); // size_t len_other = length_of_utf_string(other);
size_t nb = 0; // size_t nb = 0;
const S* src2 = src; const S* src2 = src;
const O* other2 = other; const O* other2 = other;
@ -105,7 +105,7 @@ int XStringAbstract__compare(const S* src, const O* other, bool ignoreCase)
if ( src_char32 != other_char32 ) break; if ( src_char32 != other_char32 ) break;
src2 = get_char32_from_string(src2, &src_char32); src2 = get_char32_from_string(src2, &src_char32);
other2 = get_char32_from_string(other2, &other_char32); other2 = get_char32_from_string(other2, &other_char32);
nb += 1; // nb += 1;
}; };
if ( src_char32 == other_char32 ) return 0; if ( src_char32 == other_char32 ) return 0;
return src_char32 > other_char32 ? 1 : -1; return src_char32 > other_char32 ? 1 : -1;