From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 119656 invoked by alias); 1 Oct 2016 04:29:35 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 119603 invoked by uid 89); 1 Oct 2016 04:29:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_SOFTFAIL autolearn=no version=3.3.2 spammy=H*r:112, HX-Envelope-From:sk:simon.m, STATE, State X-HELO: simark.ca Received: from simark.ca (HELO simark.ca) (158.69.221.121) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 01 Oct 2016 04:29:30 +0000 Received: by simark.ca (Postfix, from userid 112) id E58501E13A; Sat, 1 Oct 2016 00:29:28 -0400 (EDT) Received: from simark.ca (localhost [127.0.0.1]) by simark.ca (Postfix) with ESMTP id D64D31E109; Sat, 1 Oct 2016 00:29:27 -0400 (EDT) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 01 Oct 2016 04:29:00 -0000 From: Simon Marchi To: Tom Tromey Cc: gdb-patches@sourceware.org Subject: Re: [RFA 09/22] Remove make_cleanup_restore_current_ui In-Reply-To: <1474949330-4307-10-git-send-email-tom@tromey.com> References: <1474949330-4307-1-git-send-email-tom@tromey.com> <1474949330-4307-10-git-send-email-tom@tromey.com> Message-ID: <8f9af0b666b9bd9c8305631c607cd591@simark.ca> X-Sender: simon.marchi@polymtl.ca User-Agent: Roundcube Webmail/1.2.0 X-IsSubscribed: yes X-SW-Source: 2016-10/txt/msg00005.txt.bz2 On 2016-09-27 00:08, Tom Tromey wrote: > --- a/gdb/top.h > +++ b/gdb/top.h > @@ -155,27 +155,52 @@ extern struct ui *current_ui; > /* The list of all UIs. */ > extern struct ui *ui_list; > > -/* State for SWITCH_THRU_ALL_UIS. Declared here because it is meant > - to be created on the stack, but should be treated as opaque. */ > -struct switch_thru_all_uis > +/* State for SWITCH_THRU_ALL_UIS. */ > +class switch_thru_all_uis > { > +public: > + > + switch_thru_all_uis () : iter (nullptr), save_ui (¤t_ui) We are targetting C++98, aren't we? Or is it C++03? Either way, nullptr appeared in C++11, so I guess we can't use it. The fact that your compiler (and mine) did not catch this begs the question, should we have one of -std=c++98/gnu++98/c++03/gnu++03 in our compilation flags, instead of relying of the compiler's default mode? > + { > + iter = ui_list; > + } > + > + ~switch_thru_all_uis () > + { > + } > + > + // If done iterating, return true; otherwise return false. > + bool done () const > + { > + return iter == nullptr; > + } > + > + // Move to the next UI, setting current_ui if iteration is not yet > + // complete. > + void next () > + { > + iter = iter->next; > + if (iter != nullptr) > + current_ui = iter; > + } > + > + 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 *iter; > - struct cleanup *old_chain; > -}; > > -/* Functions to drive SWITCH_THRU_ALL_UIS. Though declared here by > - necessity, these functions should not be used other than via the > - SWITCH_THRU_ALL_UIS macro defined below. */ > -extern void switch_thru_all_uis_init (struct switch_thru_all_uis > *state); > -extern int switch_thru_all_uis_cond (struct switch_thru_all_uis > *state); > -extern void switch_thru_all_uis_next (struct switch_thru_all_uis > *state); > + // Save and restore current_ui. > + scoped_restore save_ui; > +}; > > /* Traverse through all UI, and switch the current UI to the one > being iterated. */ > #define SWITCH_THRU_ALL_UIS(STATE) \ You can remove STATE here. I am surprised the preprocessor doesn't care about the missing argument in macro references.