From 1c3b85ad28085c870f345a341279a869a1560f49 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 15 Jan 2021 19:35:36 +0000 Subject: [PATCH] use DISABLE_COPY_AND_ASSIGN in switch_thru_all_uis In switch_thru_all_uis, a pre-c++11 way of removing copy constructor and assignment operator is used. This patch uses the DISABLE_COPY_AND_ASSIGN macro which does the right thing for pre and post c++11. gdb/Changelog: 2021-01-19 Lancelot SIX * top.h (switch_thru_all_uis): Use DISABLE_COPY_AND_ASSIGN. --- gdb/ChangeLog | 4 ++++ gdb/top.h | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3c8379c50dd..8a9507223a5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2021-01-19 Lancelot SIX + + * top.h (switch_thru_all_uis): Use DISABLE_COPY_AND_ASSIGN. + 2021-01-19 Luis Machado * trad-frame.h (trad_frame_saved_reg) : Allocate diff --git a/gdb/top.h b/gdb/top.h index a31b19ae954..f58bebbb385 100644 --- a/gdb/top.h +++ b/gdb/top.h @@ -173,6 +173,8 @@ public: current_ui = ui_list; } + DISABLE_COPY_AND_ASSIGN (switch_thru_all_uis); + /* If done iterating, return true; otherwise return false. */ bool done () const { @@ -190,11 +192,6 @@ public: private: - /* No need for these. They are intentionally not defined - anywhere. */ - switch_thru_all_uis &operator= (const switch_thru_all_uis &); - switch_thru_all_uis (const switch_thru_all_uis &); - /* Used to iterate through the UIs. */ struct ui *m_iter; -- 2.30.2