luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-30 12:54:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wfloat-conversion' into 'main'

Browse Source 
build: Enable -Wfloat-conversion and fix warnings

See merge request GNOME/glib!4126
This commit is contained in:
Philip Withnall
2024-09-17 17:57:11 +00:00
parent 99c749f4ec f24bb8dc19
commit 7a7d8d548a
17 changed files with 258 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gtask.c
View File

@@ -1537,7 +1537,7 @@ g_task_thread_setup (void)
if (tasks_running == G_TASK_POOL_SIZE)
task_wait_time = G_TASK_WAIT_TIME_BASE;
else if (tasks_running > G_TASK_POOL_SIZE && tasks_running < G_TASK_WAIT_TIME_MAX_POOL_SIZE)
task_wait_time *= G_TASK_WAIT_TIME_MULTIPLIER;
task_wait_time = (guint64) (task_wait_time * G_TASK_WAIT_TIME_MULTIPLIER);
if (tasks_running >= G_TASK_POOL_SIZE)
g_source_set_ready_time (task_pool_manager, g_get_monotonic_time () + task_wait_time);
@@ -1562,7 +1562,7 @@ g_task_thread_cleanup (void)
g_source_set_ready_time (task_pool_manager, -1);
if (tasks_running > G_TASK_POOL_SIZE && tasks_running < G_TASK_WAIT_TIME_MAX_POOL_SIZE)
task_wait_time /= G_TASK_WAIT_TIME_MULTIPLIER;
task_wait_time = (guint64) (task_wait_time / G_TASK_WAIT_TIME_MULTIPLIER);
tasks_running--;

7
gio/tests/srvtarget.c
View File

@@ -30,7 +30,8 @@
struct {
const char *order;
int expected, seen;
gdouble expected;
unsigned int seen;
} ordering[] = {
/* There are 32 legitimate orderings; the result always has to start
* with either "fe" (usually) or "ef" (rarely). For the remaining
@@ -141,8 +142,8 @@ test_srv_target_ordering (void)
*/
for (o = 0; o < NUM_ORDERINGS; o++)
{
g_assert_cmpint (ordering[o].seen, >, ordering[o].expected / 2);
g_assert_cmpint (ordering[o].seen, <, ordering[o].expected * 2);
g_assert_cmpuint (ordering[o].seen, >, (guint64) (ordering[o].expected / 2));
g_assert_cmpuint (ordering[o].seen, <, (guint64) (ordering[o].expected * 2));
}
g_resolver_free_targets (targets);