From 3a843482aa0a64efdf97107d33fb16bf1ab9b4f4 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 20 May 2021 20:45:15 -0400 Subject: [PATCH] c++11 hygiene: use cxx_override macro for pre-4.7 g++ --- elaborate.h | 6 +++--- translate.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/elaborate.h b/elaborate.h index 935027f40..9817172a7 100644 --- a/elaborate.h +++ b/elaborate.h @@ -203,13 +203,13 @@ struct derived_probe: public probe virtual void join_group (systemtap_session& s) = 0; virtual probe_point* sole_location () const; virtual probe_point* script_location () const; - virtual void printsig (std::ostream &o) const override; + virtual void printsig (std::ostream &o) const cxx_override; void printsig_nonest (std::ostream &o) const; // return arguments of probe if there virtual void getargs (std::list &) const {} void printsig_nested (std::ostream &o) const; - virtual void collect_derivation_chain (std::vector &probes_list) const override; - virtual void collect_derivation_pp_chain (std::vector &pp_list) const override; + virtual void collect_derivation_chain (std::vector &probes_list) const cxx_override; + virtual void collect_derivation_pp_chain (std::vector &pp_list) const cxx_override; std::string derived_locations (bool firstFrom = true); virtual void print_dupe_stamp(std::ostream&) {} diff --git a/translate.cxx b/translate.cxx index 293df1a20..d85483b92 100644 --- a/translate.cxx +++ b/translate.cxx @@ -300,8 +300,8 @@ struct c_tmpcounter cxx_final: public c_unparser // var_declare(), which will forward to the parent c_unparser for output; void var_declare(string const&, var const& v) cxx_override; - void emit_function (functiondecl* fd) override; - void emit_probe (derived_probe* dp) override; + void emit_function (functiondecl* fd) cxx_override; + void emit_probe (derived_probe* dp) cxx_override; const string& get_compiled_printf (bool print_to_stream, const string& format) cxx_override; -- 2.43.5