aboutsummaryrefslogtreecommitdiff
path: root/gdb/guile/scm-iterator.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2015-09-07 19:34:31 +0100
committerPedro Alves <palves@redhat.com>2015-09-07 19:34:31 +0100
commit72e0248351fdc4ab125a16af24df031bca2275e4 (patch)
treece243844c02fff130389d32ed3b7eeec23a0e3fd /gdb/guile/scm-iterator.c
parent3d4fde6974a1237d79055ee734d99cc49c6fd3f9 (diff)
downloadgdb-72e0248351fdc4ab125a16af24df031bca2275e4.zip
gdb-72e0248351fdc4ab125a16af24df031bca2275e4.tar.gz
gdb-72e0248351fdc4ab125a16af24df031bca2275e4.tar.bz2
guile: Add as_a_scm_t_subr
Building GDB in C++ mode on Fedora 20, the gdb/guile/ code shows ~280 errors like: src/gdb/guile/guile.c:515:1: error: invalid conversion from ‘scm_unused_struct* (*)(SCM, SCM) {aka scm_unused_struct* (*)(scm_unused_struct*, scm_unused_struct*)}’ to ‘scm_t_subr {aka void*}’ [-fpermissive] This commit fixes them all. gdb/ChangeLog: 2015-09-07 Pedro Alves <palves@redhat.com> * guile/guile-internal.h (as_a_scm_t_subr): New. * guile/guile.c (misc_guile_functions): Use it. * guile/scm-arch.c (arch_functions): Use it. * guile/scm-block.c (block_functions, gdbscm_initialize_blocks): Use it. * guile/scm-breakpoint.c (breakpoint_functions): Use it. * guile/scm-cmd.c (command_functions): Use it. * guile/scm-disasm.c (disasm_functions): Use it. * guile/scm-exception.c (exception_functions) (private_exception_functions): Use it. * guile/scm-frame.c (frame_functions) * guile/scm-gsmob.c (gsmob_functions): Use it. * guile/scm-iterator.c (iterator_functions): Use it. * guile/scm-lazy-string.c (lazy_string_functions): Use it. * guile/scm-math.c (math_functions): Use it. * guile/scm-objfile.c (objfile_functions): Use it. * guile/scm-param.c (parameter_functions): Use it. * guile/scm-ports.c (port_functions, private_port_functions): Use it. * guile/scm-pretty-print.c (pretty_printer_functions): Use it. * guile/scm-progspace.c (pspace_functions): Use it. * guile/scm-string.c (string_functions): Use it. * guile/scm-symbol.c (symbol_functions): Use it. * guile/scm-symtab.c (symtab_functions): Use it. * guile/scm-type.c (type_functions, gdbscm_initialize_types): Use it. * guile/scm-value.c (value_functions): Use it.
Diffstat (limited to 'gdb/guile/scm-iterator.c')
-rw-r--r--gdb/guile/scm-iterator.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/gdb/guile/scm-iterator.c b/gdb/guile/scm-iterator.c
index 46787a2..5a61436 100644
--- a/gdb/guile/scm-iterator.c
+++ b/gdb/guile/scm-iterator.c
@@ -301,7 +301,7 @@ gdbscm_iterator_next_x (SCM self)
static const scheme_function iterator_functions[] =
{
- { "make-iterator", 3, 0, 0, gdbscm_make_iterator,
+ { "make-iterator", 3, 0, 0, as_a_scm_t_subr (gdbscm_make_iterator),
"\
Create a <gdb:iterator> object.\n\
\n\
@@ -314,31 +314,32 @@ Create a <gdb:iterator> object.\n\
By convention end-of-iteration should be marked with (end-of-iteration)\n\
from module (gdb iterator)." },
- { "iterator?", 1, 0, 0, gdbscm_iterator_p,
+ { "iterator?", 1, 0, 0, as_a_scm_t_subr (gdbscm_iterator_p),
"\
Return #t if the object is a <gdb:iterator> object." },
- { "iterator-object", 1, 0, 0, gdbscm_iterator_object,
+ { "iterator-object", 1, 0, 0, as_a_scm_t_subr (gdbscm_iterator_object),
"\
Return the object being iterated over." },
- { "iterator-progress", 1, 0, 0, gdbscm_iterator_progress,
+ { "iterator-progress", 1, 0, 0, as_a_scm_t_subr (gdbscm_iterator_progress),
"\
Return the progress object of the iterator." },
- { "set-iterator-progress!", 2, 0, 0, gdbscm_set_iterator_progress_x,
+ { "set-iterator-progress!", 2, 0, 0,
+ as_a_scm_t_subr (gdbscm_set_iterator_progress_x),
"\
Set the progress object of the iterator." },
- { "iterator-next!", 1, 0, 0, gdbscm_iterator_next_x,
+ { "iterator-next!", 1, 0, 0, as_a_scm_t_subr (gdbscm_iterator_next_x),
"\
Invoke the next! procedure of the iterator and return its result." },
- { "end-of-iteration", 0, 0, 0, gdbscm_end_of_iteration,
+ { "end-of-iteration", 0, 0, 0, as_a_scm_t_subr (gdbscm_end_of_iteration),
"\
Return the end-of-iteration marker." },
- { "end-of-iteration?", 1, 0, 0, gdbscm_end_of_iteration_p,
+ { "end-of-iteration?", 1, 0, 0, as_a_scm_t_subr (gdbscm_end_of_iteration_p),
"\
Return #t if the object is the end-of-iteration marker." },