c++11 hygiene: use cxx_override macro for pre-4.7 g++

diff --git a/elaborate.h b/elaborate.h
index 935027f408469c0e8d755e5bd78b263acfd67043..9817172a7e6e6efdfe69c3bcbad435425a6d5c3a 100644 (file)
--- 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<std::string> &) const {}
   void printsig_nested (std::ostream &o) const;
-  virtual void collect_derivation_chain (std::vector<probe*> &probes_list) const override;
-  virtual void collect_derivation_pp_chain (std::vector<probe_point*> &pp_list) const override;
+  virtual void collect_derivation_chain (std::vector<probe*> &probes_list) const cxx_override;
+  virtual void collect_derivation_pp_chain (std::vector<probe_point*> &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 293df1a2024925a06ca8d78aec459ee2936d9ab9..d85483b92a3d3a104fee007fa54baa28e30468bc 100644 (file)
--- 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;