X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fannotate.c;h=495aa2dba68d2d851ab45ff156809fddccf35ffd;hb=dbbc8b7e629fa666affd9a3f475d0bf6e5264677;hp=f68ff1098f1b86bedb754d090ef9b409f7dd9807;hpb=481695ed5f6e0a8a9c9c50bfac1cdd2b3151e6c9;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/annotate.c b/gdb/annotate.c
index f68ff1098f..495aa2dba6 100644
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -1,5 +1,5 @@
 /* Annotation routines for GDB.
-   Copyright (C) 1986-2017 Free Software Foundation, Inc.
+   Copyright (C) 1986-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,7 +22,7 @@
 #include "target.h"
 #include "gdbtypes.h"
 #include "breakpoint.h"
-#include "observer.h"
+#include "observable.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "top.h"
@@ -63,14 +63,14 @@ annotate_breakpoints_invalid (void)
     {
       /* If the inferior owns the terminal (e.g., we're resuming),
 	 make sure to leave with the inferior still owning it.  */
-      int was_inferior = target_terminal_is_inferior ();
+      int was_inferior = target_terminal::is_inferior ();
 
-      target_terminal_ours_for_output ();
+      target_terminal::ours_for_output ();
 
       printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
 
       if (was_inferior)
-	target_terminal_inferior ();
+	target_terminal::inferior ();
 
       breakpoints_invalid_emitted = 1;
     }
@@ -210,14 +210,14 @@ annotate_frames_invalid (void)
     {
       /* If the inferior owns the terminal (e.g., we're resuming),
 	 make sure to leave with the inferior still owning it.  */
-      int was_inferior = target_terminal_is_inferior ();
+      int was_inferior = target_terminal::is_inferior ();
 
-      target_terminal_ours_for_output ();
+      target_terminal::ours_for_output ();
 
       printf_unfiltered (("\n\032\032frames-invalid\n"));
 
       if (was_inferior)
-	target_terminal_inferior ();
+	target_terminal::inferior ();
 
       frames_invalid_emitted = 1;
     }
@@ -592,7 +592,7 @@ breakpoint_changed (struct breakpoint *b)
 void
 _initialize_annotate (void)
 {
-  observer_attach_breakpoint_created (breakpoint_changed);
-  observer_attach_breakpoint_deleted (breakpoint_changed);
-  observer_attach_breakpoint_modified (breakpoint_changed);
+  gdb::observers::breakpoint_created.attach (breakpoint_changed);
+  gdb::observers::breakpoint_deleted.attach (breakpoint_changed);
+  gdb::observers::breakpoint_modified.attach (breakpoint_changed);
 }