[pushed] Add overrides, fix FreeBSD build

Message ID 1530111330-17606-1-git-send-email-simon.marchi@ericsson.com
State New, archived
Headers

Commit Message

Simon Marchi June 27, 2018, 2:55 p.m. UTC
  Fix this:

  CXX    fbsd-nat.o
In file included from fbsd-nat.c:44:
./fbsd-nat.h:40:7: error: 'find_memory_regions' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
  int find_memory_regions (find_memory_region_ftype func, void *data);
      ^
./target.h:702:17: note: overridden virtual function is here
    virtual int find_memory_regions (find_memory_region_ftype func, void *data)
                ^
In file included from fbsd-nat.c:44:
./fbsd-nat.h:42:8: error: 'info_proc' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
  bool info_proc (const char *, enum info_proc_what);
       ^
./target.h:950:18: note: overridden virtual function is here
    virtual bool info_proc (const char *, enum info_proc_what);
                 ^

gdb/ChangeLog:

	* fbsd-nat.h (class fbsd_nat_target) <find_memory_regions>: Add
	override.
	<info_proc>: Likewise.
---
 gdb/ChangeLog  | 6 ++++++
 gdb/fbsd-nat.h | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
  

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d4ae16c..c315246 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@ 
+2018-06-27  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* fbsd-nat.h (class fbsd_nat_target) <find_memory_regions>: Add
+	override.
+	<info_proc>: Likewise.
+
 2018-06-26  Joel Brobecker  <brobecker@adacore.com>
 
 	* windows-nat.c (do_windows_fetch_inferior_registers): Rename
diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h
index 8c90dd0..3e34600 100644
--- a/gdb/fbsd-nat.h
+++ b/gdb/fbsd-nat.h
@@ -37,9 +37,9 @@  class fbsd_nat_target : public inf_ptrace_target
 public:
   char *pid_to_exec_file (int pid) override;
 
-  int find_memory_regions (find_memory_region_ftype func, void *data);
+  int find_memory_regions (find_memory_region_ftype func, void *data) override;
 
-  bool info_proc (const char *, enum info_proc_what);
+  bool info_proc (const char *, enum info_proc_what) override;
 
 #ifdef KERN_PROC_AUXV
   enum target_xfer_status xfer_partial (enum target_object object,