Merge branch 'disable-assert-fix' into 'main'

gvariant: Fix unused variables when G_DISABLE_ASSERT is defined

See merge request GNOME/glib!4322
This commit is contained in:
Michael Catanzaro 2024-10-01 13:57:04 +00:00
commit 637ec98f2e

View File

@ -162,7 +162,7 @@ static void
g_variant_type_info_check (const GVariantTypeInfo *info, g_variant_type_info_check (const GVariantTypeInfo *info,
char container_class) char container_class)
{ {
#ifdef G_ENABLE_DEBUG #if defined(G_ENABLE_DEBUG) && !defined(G_DISABLE_ASSERT)
g_assert (!container_class || info->container_class == container_class); g_assert (!container_class || info->container_class == container_class);
/* alignment can only be one of these */ /* alignment can only be one of these */
@ -191,7 +191,7 @@ g_variant_type_info_check (const GVariantTypeInfo *info,
g_assert (0 <= index && index < 24); g_assert (0 <= index && index < 24);
g_assert (g_variant_type_info_basic_chars[index][0] != ' '); g_assert (g_variant_type_info_basic_chars[index][0] != ' ');
} }
#endif /* G_ENABLE_DEBUG */ #endif /* G_ENABLE_DEBUG && !G_DISABLE_ASSERT */
} }
/* < private > /* < private >