Fix clang 9 constant-conversion warnings

Signed-off-by: Gary Lockyer <[email protected]> Reviewed-by: Andreas Schneider <[email protected]>
Huoke · May 8, 2020 · 5e44b7c · 5e44b7c
1 parent fa83327
commit 5e44b7c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
@@ -796,7 +796,6 @@ def SAMBA_CONFIG_H(conf, path=None):
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=missing-field-initializers', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=unused-function', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=enum-conversion', testflags=True)
-            conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=constant-conversion', testflags=True)
 
     if Options.options.fatal_errors:
         conf.ADD_CFLAGS('-Wfatal-errors', testflags=True)

diff --git a/source4/torture/ndr/dnsp.c b/source4/torture/ndr/dnsp.c
@@ -332,7 +332,7 @@ static bool dnsp_dnsProperty_deleted_by_check(struct torture_context *tctx,
 	torture_assert_int_equal(tctx, r->version, 1, "version");
 	torture_assert_int_equal(tctx, r->id, DSPROPERTY_ZONE_DELETED_FROM_HOSTNAME, "id");
 	torture_assert_str_equal(tctx, r->data.deleted_by_hostname, "w2k3-191.w2k3.base", "hostname");
-	torture_assert_int_equal(tctx, r->name, 4092359108, "name (random)");
+	torture_assert_int_equal(tctx, r->name, 0xf3ec71c4, "name (random)");
 
 	return true;
 }