More uses of ui_out_emit_tuple

[deliverable/binutils-gdb.git] / gdb / annotate.h

diff --git a/gdb/annotate.h b/gdb/annotate.h
index 0eae524870d4b3d4594aee69c35ec8cd2f6d375c..7161689b390abb8efe992253476f1c7f06a929a6 100644 (file)
--- a/gdb/annotate.h
+++ b/gdb/annotate.h
@@ -1,6 +1,5 @@
 /* Annotation routines for GDB.
-   Copyright (C) 1986, 1989-1992, 1994, 1998-2000, 2007-2012 Free
-   Software Foundation, Inc.
+   Copyright (C) 1986-2017 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,9 +19,6 @@
 #include "symtab.h"
 #include "gdbtypes.h"
 
-extern void breakpoints_changed (void);
-
-extern void annotate_ignore_count_change (void);
 extern void annotate_breakpoint (int);
 extern void annotate_catchpoint (int);
 extern void annotate_watchpoint (int);
@@ -46,6 +42,8 @@ extern void annotate_frames_invalid (void);
 extern void annotate_new_thread (void);
 extern void annotate_thread_changed (void);
 
+extern void annotate_display_prompt (void);
+
 struct type;
 
 extern void annotate_field_begin (struct type *);
@@ -76,6 +74,17 @@ extern void annotate_arg_name_end (void);
 extern void annotate_arg_value (struct type *);
 extern void annotate_arg_end (void);
 
+/* Wrap calls to annotate_arg_begin and annotate_arg_end in an RAII
+   class. */
+struct annotate_arg_emitter
+{
+  annotate_arg_emitter () { annotate_arg_begin (); }
+  ~annotate_arg_emitter () { annotate_arg_end (); }
+
+  annotate_arg_emitter (const annotate_arg_emitter &) = delete;
+  annotate_arg_emitter &operator= (const annotate_arg_emitter &) = delete;
+};
+
 extern void annotate_source (char *, int, int, int,
                             struct gdbarch *, CORE_ADDR);