From e154e3325eb7274b8164f8d7a5e0f335646c2bb7 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 7 Jun 2011 08:25:07 +0800 Subject: [PATCH] Clean up gobject/gvaluetransform.c a bit The check for _MSC_VER here is not necessary here because: -One cannot compile GLib out-of-the-box with VS 2003 (let alone VS6 or earlier) since GLib 2.22.4 or so. -This code compiles fine with the currently-supported VS versions (2008/2010) without the error mentioned in the comments. This will close Bug 652002. --- gobject/gvaluetransform.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gobject/gvaluetransform.c b/gobject/gvaluetransform.c index 1b7b4fd..2352be5 100644 --- a/gobject/gvaluetransform.c +++ b/gobject/gvaluetransform.c @@ -106,16 +106,8 @@ DEFINE_CAST (uint64_uint, v_uint64, guint, v_uint); DEFINE_CAST (uint64_long, v_uint64, glong, v_long); DEFINE_CAST (uint64_ulong, v_uint64, gulong, v_ulong); DEFINE_CAST (uint64_int64, v_uint64, gint64, v_int64); -#ifdef _MSC_VER -/* work around error C2520: conversion from unsigned __int64 to double - * not implemented, use signed __int64 - * If it is supported don't miss to g_value_register_transform_func() below - */ -#pragma message ("Check if cast from uint64 to double is supported with msvc 6.0") -#else DEFINE_CAST (uint64_float, v_uint64, gfloat, v_float); DEFINE_CAST (uint64_double, v_uint64, gdouble, v_double); -#endif DEFINE_CAST (float_s8, v_float, gint8, v_int); DEFINE_CAST (float_u8, v_float, guint8, v_uint); DEFINE_CAST (float_int, v_float, gint, v_int); -- 2.7.4