Patchwork [review] Wrap shared windows-nat code in windows_nat namespace

login
register
mail settings
Submitter Simon Marchi (Code Review)
Date Nov. 26, 2019, 5:11 p.m.
Message ID <gerrit.1574788288000.I849284860100a0028e611786e021e95f4bc4b579@gnutoolchain-gerrit.osci.io>
Download mbox | patch
Permalink /patch/36218/
State New
Headers show

Comments

Simon Marchi (Code Review) - Nov. 26, 2019, 5:11 p.m.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/707
......................................................................

Wrap shared windows-nat code in windows_nat namespace

This wraps the shared windows-nat code in a windows_nat namespace.
This helps avoid name clashes.

gdb/ChangeLog
2019-11-26  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.

gdb/gdbserver/ChangeLog
2019-11-26  Tom Tromey  <tromey@adacore.com>

	* win32-low.h: Add "using namespace".

Change-Id: I849284860100a0028e611786e021e95f4bc4b579
---
M gdb/ChangeLog
M gdb/gdbserver/ChangeLog
M gdb/gdbserver/win32-low.h
M gdb/nat/windows-nat.c
M gdb/nat/windows-nat.h
M gdb/windows-nat.c
6 files changed, 24 insertions(+), 0 deletions(-)
Simon Marchi (Code Review) - Nov. 29, 2019, 7:12 p.m.
Pedro Alves has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/707
......................................................................


Patch Set 1:

(1 comment)

| --- gdb/gdbserver/win32-low.h
| +++ gdb/gdbserver/win32-low.h
| @@ -16,17 +16,19 @@ /* Internal interfaces for the Win32 specific target code for gdbserver.
|     You should have received a copy of the GNU General Public License
|     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
|  
|  #ifndef GDBSERVER_WIN32_LOW_H
|  #define GDBSERVER_WIN32_LOW_H
|  
|  #include <windows.h>
|  #include "nat/windows-nat.h"
|  
| +using namespace windows_nat;

PS1, Line 25:

Seems a bit icky to do this in a header.  Would it complicate things
to avoid it?

| +
|  struct target_desc;
|  
|  /* The inferior's target description.  This is a global because the
|     Windows ports support neither bi-arch nor multi-process.  */
|  extern const struct target_desc *win32_tdesc;
|  
|  struct win32_target_ops
|  {
Simon Marchi (Code Review) - Dec. 4, 2019, 3:45 p.m.
Tom Tromey has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/707
......................................................................


Patch Set 1:

(1 comment)

| --- gdb/gdbserver/win32-low.h
| +++ gdb/gdbserver/win32-low.h
| @@ -16,17 +16,19 @@ /* Internal interfaces for the Win32 specific target code for gdbserver.
|     You should have received a copy of the GNU General Public License
|     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
|  
|  #ifndef GDBSERVER_WIN32_LOW_H
|  #define GDBSERVER_WIN32_LOW_H
|  
|  #include <windows.h>
|  #include "nat/windows-nat.h"
|  
| +using namespace windows_nat;

PS1, Line 25:

> Seems a bit icky to do this in a header.  Would it complicate things to avoid it?

It turned out not to be too bad.

| +
|  struct target_desc;
|  
|  /* The inferior's target description.  This is a global because the
|     Windows ports support neither bi-arch nor multi-process.  */
|  extern const struct target_desc *win32_tdesc;
|  
|  struct win32_target_ops
|  {

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 08d2ecb..a613484 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@ 
 2019-11-26  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.
+
+2019-11-26  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/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 6dcb274..03fcd87 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,9 @@ 
 2019-11-26  Tom Tromey  <tromey@adacore.com>
 
+	* win32-low.h: Add "using namespace".
+
+2019-11-26  Tom Tromey  <tromey@adacore.com>
+
 	* win32-low.c (delete_thread_info): Don't call CloseHandle.
 
 2019-11-26  Tom Tromey  <tromey@adacore.com>
diff --git a/gdb/gdbserver/win32-low.h b/gdb/gdbserver/win32-low.h
index 342411d..5a94686 100644
--- a/gdb/gdbserver/win32-low.h
+++ b/gdb/gdbserver/win32-low.h
@@ -22,6 +22,8 @@ 
 #include <windows.h>
 #include "nat/windows-nat.h"
 
+using namespace windows_nat;
+
 struct target_desc;
 
 /* The inferior's target description.  This is a global because the
diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c
index e5a12c3..375ceb7 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 @@ 
     }
   suspended = 0;
 }
+
+}
diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h
index 8535a15..2f9b181 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
@@ -81,4 +84,6 @@ 
   gdb::unique_xmalloc_ptr<char> name;
 };
 
+}
+
 #endif
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 8448d1c..198bb5a 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -71,6 +71,8 @@ 
 #include "gdbsupport/pathstuff.h"
 #include "nat/windows-nat.h"
 
+using namespace windows_nat;
+
 #define AdjustTokenPrivileges		dyn_AdjustTokenPrivileges
 #define DebugActiveProcessStop		dyn_DebugActiveProcessStop
 #define DebugBreakProcess		dyn_DebugBreakProcess