diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/nat/windows-nat.c | 5 | ||||
| -rw-r--r-- | gdb/nat/windows-nat.h | 5 | ||||
| -rw-r--r-- | gdb/windows-nat.c | 2 | ||||
| -rw-r--r-- | gdbserver/ChangeLog | 8 | ||||
| -rw-r--r-- | gdbserver/win32-arm-low.cc | 2 | ||||
| -rw-r--r-- | gdbserver/win32-i386-low.cc | 2 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 2 | ||||
| -rw-r--r-- | gdbserver/win32-low.h | 16 |
9 files changed, 41 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 91f84c6..0286fd6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2020-04-08 Tom Tromey <tromey@adacore.com> + * windows-nat.c: Add "using namespace". + * nat/windows-nat.h: Wrap contents in windows_nat namespace. + * nat/windows-nat.c: Wrap contents in windows_nat namespace. + +2020-04-08 Tom Tromey <tromey@adacore.com> + * nat/windows-nat.h (struct windows_thread_info): Declare destructor. * nat/windows-nat.c (~windows_thread_info): New. diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index ca3e308..6c0218c 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -19,6 +19,9 @@ #include "gdbsupport/common-defs.h" #include "nat/windows-nat.h" +namespace windows_nat +{ + windows_thread_info::~windows_thread_info () { CloseHandle (h); @@ -65,3 +68,5 @@ windows_thread_info::resume () } suspended = 0; } + +} diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index ccdf207..df28364 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -21,6 +21,9 @@ #include <windows.h> +namespace windows_nat +{ + /* Thread information structure used to track extra information about each thread. */ struct windows_thread_info @@ -87,4 +90,6 @@ struct windows_thread_info gdb::unique_xmalloc_ptr<char> name; }; +} + #endif diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index ef900ea..8f848b9 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -75,6 +75,8 @@ #define STATUS_WX86_BREAKPOINT 0x4000001F #define STATUS_WX86_SINGLE_STEP 0x4000001E +using namespace windows_nat; + #define AdjustTokenPrivileges dyn_AdjustTokenPrivileges #define DebugActiveProcessStop dyn_DebugActiveProcessStop #define DebugBreakProcess dyn_DebugBreakProcess diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index e727413..8de29e5 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,13 @@ 2020-04-08 Tom Tromey <tromey@adacore.com> + * win32-low.h (struct win32_target_ops): Use qualified names where + needed. + * win32-i386-low.c: Add "using namespace". + * win32-low.c: Add "using namespace". + * win32-arm-low.c: Add "using namespace". + +2020-04-08 Tom Tromey <tromey@adacore.com> + * win32-low.c (delete_thread_info): Don't call CloseHandle. 2020-04-08 Tom Tromey <tromey@adacore.com> diff --git a/gdbserver/win32-arm-low.cc b/gdbserver/win32-arm-low.cc index c50c5df..78b7fd0 100644 --- a/gdbserver/win32-arm-low.cc +++ b/gdbserver/win32-arm-low.cc @@ -18,6 +18,8 @@ #include "server.h" #include "win32-low.h" +using namespace windows_nat; + #ifndef CONTEXT_FLOATING_POINT #define CONTEXT_FLOATING_POINT 0 #endif diff --git a/gdbserver/win32-i386-low.cc b/gdbserver/win32-i386-low.cc index 1b78cf9..1c14bc7 100644 --- a/gdbserver/win32-i386-low.cc +++ b/gdbserver/win32-i386-low.cc @@ -26,6 +26,8 @@ #include "tdesc.h" #include "x86-tdesc.h" +using namespace windows_nat; + #ifndef CONTEXT_EXTENDED_REGISTERS #define CONTEXT_EXTENDED_REGISTERS 0 #endif diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index c642d47..8f8b6ce 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -36,6 +36,8 @@ #include "gdbsupport/common-inferior.h" #include "gdbsupport/gdb_wait.h" +using namespace windows_nat; + #ifndef USE_WIN32API #include <sys/cygwin.h> #endif diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index 28ac2b0..917f727 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -40,23 +40,25 @@ struct win32_target_ops void (*initial_stuff) (void); /* Fetch the context from the inferior. */ - void (*get_thread_context) (windows_thread_info *th); + void (*get_thread_context) (windows_nat::windows_thread_info *th); /* Called just before resuming the thread. */ - void (*prepare_to_resume) (windows_thread_info *th); + void (*prepare_to_resume) (windows_nat::windows_thread_info *th); /* Called when a thread was added. */ - void (*thread_added) (windows_thread_info *th); + void (*thread_added) (windows_nat::windows_thread_info *th); /* Fetch register from gdbserver regcache data. */ void (*fetch_inferior_register) (struct regcache *regcache, - windows_thread_info *th, int r); + windows_nat::windows_thread_info *th, + int r); /* Store a new register value into the thread context of TH. */ void (*store_inferior_register) (struct regcache *regcache, - windows_thread_info *th, int r); + windows_nat::windows_thread_info *th, + int r); - void (*single_step) (windows_thread_info *th); + void (*single_step) (windows_nat::windows_thread_info *th); const unsigned char *breakpoint; int breakpoint_len; @@ -143,7 +145,7 @@ public: }; /* Retrieve the context for this thread, if not already retrieved. */ -extern void win32_require_context (windows_thread_info *th); +extern void win32_require_context (windows_nat::windows_thread_info *th); /* Map the Windows error number in ERROR to a locale-dependent error message string and return a pointer to it. Typically, the values |