From 5618a1c3d564387dff4799538e16849d2b1df816 Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Mon, 12 Feb 2018 17:55:14 +0000
Subject: [PATCH 3/3] DEFINE_OBSERVER -> DEFINE_OBSERVABLE

---
 gdb/observer.c | 86 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/gdb/observer.c b/gdb/observer.c
index 836b083125d..d85ecd2cce7 100644
--- a/gdb/observer.c
+++ b/gdb/observer.c
@@ -30,50 +30,50 @@ namespace observers
 
 unsigned int observer_debug;
 
-#define DEFINE_OBSERVER(name) decltype (name) name (# name)
+#define DEFINE_OBSERVABLE(name) decltype (name) name (# name)
 
-DEFINE_OBSERVER (normal_stop);
-DEFINE_OBSERVER (signal_received);
-DEFINE_OBSERVER (end_stepping_range);
-DEFINE_OBSERVER (signal_exited);
-DEFINE_OBSERVER (exited);
-DEFINE_OBSERVER (no_history);
-DEFINE_OBSERVER (sync_execution_done);
-DEFINE_OBSERVER (command_error);
-DEFINE_OBSERVER (target_changed);
-DEFINE_OBSERVER (executable_changed);
-DEFINE_OBSERVER (inferior_created);
-DEFINE_OBSERVER (record_changed);
-DEFINE_OBSERVER (solib_loaded);
-DEFINE_OBSERVER (solib_unloaded);
-DEFINE_OBSERVER (new_objfile);
-DEFINE_OBSERVER (free_objfile);
-DEFINE_OBSERVER (new_thread);
-DEFINE_OBSERVER (thread_exit);
-DEFINE_OBSERVER (thread_stop_requested);
-DEFINE_OBSERVER (target_resumed);
-DEFINE_OBSERVER (about_to_proceed);
-DEFINE_OBSERVER (breakpoint_created);
-DEFINE_OBSERVER (breakpoint_deleted);
-DEFINE_OBSERVER (breakpoint_modified);
-DEFINE_OBSERVER (traceframe_changed);
-DEFINE_OBSERVER (architecture_changed);
-DEFINE_OBSERVER (thread_ptid_changed);
-DEFINE_OBSERVER (inferior_added);
-DEFINE_OBSERVER (inferior_appeared);
-DEFINE_OBSERVER (inferior_exit);
-DEFINE_OBSERVER (inferior_removed);
-DEFINE_OBSERVER (memory_changed);
-DEFINE_OBSERVER (before_prompt);
-DEFINE_OBSERVER (gdb_datadir_changed);
-DEFINE_OBSERVER (command_param_changed);
-DEFINE_OBSERVER (tsv_created);
-DEFINE_OBSERVER (tsv_deleted);
-DEFINE_OBSERVER (tsv_modified);
-DEFINE_OBSERVER (inferior_call_pre);
-DEFINE_OBSERVER (inferior_call_post);
-DEFINE_OBSERVER (register_changed);
-DEFINE_OBSERVER (user_selected_context_changed);
+DEFINE_OBSERVABLE (normal_stop);
+DEFINE_OBSERVABLE (signal_received);
+DEFINE_OBSERVABLE (end_stepping_range);
+DEFINE_OBSERVABLE (signal_exited);
+DEFINE_OBSERVABLE (exited);
+DEFINE_OBSERVABLE (no_history);
+DEFINE_OBSERVABLE (sync_execution_done);
+DEFINE_OBSERVABLE (command_error);
+DEFINE_OBSERVABLE (target_changed);
+DEFINE_OBSERVABLE (executable_changed);
+DEFINE_OBSERVABLE (inferior_created);
+DEFINE_OBSERVABLE (record_changed);
+DEFINE_OBSERVABLE (solib_loaded);
+DEFINE_OBSERVABLE (solib_unloaded);
+DEFINE_OBSERVABLE (new_objfile);
+DEFINE_OBSERVABLE (free_objfile);
+DEFINE_OBSERVABLE (new_thread);
+DEFINE_OBSERVABLE (thread_exit);
+DEFINE_OBSERVABLE (thread_stop_requested);
+DEFINE_OBSERVABLE (target_resumed);
+DEFINE_OBSERVABLE (about_to_proceed);
+DEFINE_OBSERVABLE (breakpoint_created);
+DEFINE_OBSERVABLE (breakpoint_deleted);
+DEFINE_OBSERVABLE (breakpoint_modified);
+DEFINE_OBSERVABLE (traceframe_changed);
+DEFINE_OBSERVABLE (architecture_changed);
+DEFINE_OBSERVABLE (thread_ptid_changed);
+DEFINE_OBSERVABLE (inferior_added);
+DEFINE_OBSERVABLE (inferior_appeared);
+DEFINE_OBSERVABLE (inferior_exit);
+DEFINE_OBSERVABLE (inferior_removed);
+DEFINE_OBSERVABLE (memory_changed);
+DEFINE_OBSERVABLE (before_prompt);
+DEFINE_OBSERVABLE (gdb_datadir_changed);
+DEFINE_OBSERVABLE (command_param_changed);
+DEFINE_OBSERVABLE (tsv_created);
+DEFINE_OBSERVABLE (tsv_deleted);
+DEFINE_OBSERVABLE (tsv_modified);
+DEFINE_OBSERVABLE (inferior_call_pre);
+DEFINE_OBSERVABLE (inferior_call_post);
+DEFINE_OBSERVABLE (register_changed);
+DEFINE_OBSERVABLE (user_selected_context_changed);
 
 } /* namespace observers */
 } /* namespace gdb */
-- 
2.14.3