diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 66f6dd6439..84fa7736d3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-29  Pedro Alves  <palves@redhat.com>
+
+	* gnu-v2-abi.c (gnuv2_is_destructor_name)
+	(gnuv2_is_constructor_name): Add casts.
+
 2015-10-29  Pedro Alves  <palves@redhat.com>
 
 	* common/common-exceptions.c (exception_none): Add cast.
diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c
index c508b55266..6c2b92a878 100644
--- a/gdb/gnu-v2-abi.c
+++ b/gdb/gnu-v2-abi.c
@@ -40,7 +40,7 @@ gnuv2_is_destructor_name (const char *name)
       || startswith (name, "__dt__"))
     return complete_object_dtor;
   else
-    return 0;
+    return (enum dtor_kinds) 0;
 }
 
 static enum ctor_kinds
@@ -51,7 +51,7 @@ gnuv2_is_constructor_name (const char *name)
       || startswith (name, "__ct__"))
     return complete_object_ctor;
   else
-    return 0;
+    return (enum ctor_kinds) 0;
 }
 
 static int