Skip to content

Commit 48466f7

Browse files
committed
build: fix build failures on gcc-12
exch/exmdb/common_util.cpp: In function 'long int exmdb::cu_check_msgsize_overflow(sqlite3*, uint32_t)': exch/exmdb/common_util.cpp:781:31: error: could not convert '{qtag, {anonymous}::PR_MESSAGE_SIZE_EXTENDED}' from '<brace-enclosed initializer list>' to 'proptag_cspan' 781 | if (!cu_get_properties(MAPI_STORE, 0, CP_ACP, psqlite, 782 | {qtag, PR_MESSAGE_SIZE_EXTENDED}, &propvals)) exch/exmdb/common_util.cpp:1620:31: error: could not convert '{proptag}' from '<brace-enclosed initializer list>' to 'proptag_cspan' 1620 | if (!cu_get_properties(table_type, 1621 | id, cpid, psqlite, {proptag}, &propvals)) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 parent fd55ae6 commit 48466f7

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

exch/exmdb/common_util.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -774,12 +774,13 @@ BOOL common_util_check_msgcnt_overflow(sqlite3 *psqlite)
774774
return c >= g_max_msg ? TRUE : false;
775775
}
776776

777-
BOOL cu_check_msgsize_overflow(sqlite3 *psqlite, uint32_t qtag)
777+
bool cu_check_msgsize_overflow(sqlite3 *psqlite, proptag_t qtag)
778778
{
779+
const proptag_t tags[] = {qtag, PR_MESSAGE_SIZE_EXTENDED};
779780
TPROPVAL_ARRAY propvals;
780781

781782
if (!cu_get_properties(MAPI_STORE, 0, CP_ACP, psqlite,
782-
{qtag, PR_MESSAGE_SIZE_EXTENDED}, &propvals))
783+
tags, &propvals))
783784
return FALSE;
784785
auto ptotal = propvals.get<uint64_t>(PR_MESSAGE_SIZE_EXTENDED);
785786
auto qv_kb = propvals.get<uint32_t>(qtag);
@@ -1615,9 +1616,10 @@ static void *cu_get_object_text_v0(const char *dir, const char *cid,
16151616
BOOL cu_get_property(mapi_object_type table_type, uint64_t id,
16161617
cpid_t cpid, sqlite3 *psqlite, proptag_t proptag, void **ppvalue)
16171618
{
1619+
const proptag_t tags[] = {proptag};
16181620
TPROPVAL_ARRAY propvals;
16191621
if (!cu_get_properties(table_type,
1620-
id, cpid, psqlite, {proptag}, &propvals))
1622+
id, cpid, psqlite, tags, &propvals))
16211623
return FALSE;
16221624
*ppvalue = propvals.count == 0 ? nullptr : propvals.ppropval[0].pvalue;
16231625
return TRUE;

include/gromox/exmdb_common_util.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ extern bool cu_remove_properties(mapi_object_type, uint64_t id, sqlite3 *, propt
8686
extern BOOL common_util_get_rule_property(uint64_t rule_id, sqlite3 *, gromox::proptag_t, void **val);
8787
extern bool cu_get_permission_property(int64_t member_id, sqlite3 *, gromox::proptag_t, void **outval);
8888
BOOL common_util_check_msgcnt_overflow(sqlite3 *psqlite);
89-
extern BOOL cu_check_msgsize_overflow(sqlite3 *psqlite, uint32_t qtag);
89+
extern bool cu_check_msgsize_overflow(sqlite3 *, gromox::proptag_t);
9090
extern uint32_t cu_folder_unread_count(sqlite3 *psqlite, uint64_t folder_id, unsigned int flags = 0);
9191
extern BOOL common_util_get_folder_type(sqlite3 *, uint64_t folder_id, uint32_t *type, const char *dir = nullptr);
9292
uint64_t common_util_get_folder_parent_fid(

0 commit comments

Comments
 (0)