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

Message ID gerrit.1572371871000.I56105d1c87a4170377364351dddf9f71be182546@gnutoolchain-gerrit.osci.io
State Superseded
Headers show
Series
  • [review] Wrap shared windows-nat code in windows_nat namespace
Related show

Commit Message

Simon Marchi (Code Review) Oct. 29, 2019, 5:57 p.m.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/416
......................................................................

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.

Change-Id: I849284860100a0028e611786e021e95f4bc4b579

gdb/ChangeLog
2019-10-29  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-10-29  Tom Tromey  <tromey@adacore.com>

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

Change-Id: I56105d1c87a4170377364351dddf9f71be182546
---
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(-)




-- 
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I56105d1c87a4170377364351dddf9f71be182546
Gerrit-Change-Number: 416
Gerrit-PatchSet: 1
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newchange

Comments

Simon Marchi (Code Review) Nov. 26, 2019, 10:54 p.m. | #1
Luis Machado has posted comments on this change.

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


Patch Set 1: Code-Review+1

Looks OK.


-- 
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I56105d1c87a4170377364351dddf9f71be182546
Gerrit-Change-Number: 416
Gerrit-PatchSet: 1
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Luis Machado <luis.machado@linaro.org>
Gerrit-Comment-Date: Tue, 26 Nov 2019 22:54:27 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2a63867..6b6159b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@ 
 2019-10-29  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-10-29  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 fb1c7bc..5b73d88 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,9 @@ 
 2019-10-29  Tom Tromey  <tromey@adacore.com>
 
+	* win32-low.h: Add "using namespace".
+
+2019-10-29  Tom Tromey  <tromey@adacore.com>
+
 	* win32-low.c (delete_thread_info): Don't call CloseHandle.
 
 2019-10-29  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 2a0e3a3..725860c 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);
@@ -63,3 +66,5 @@ 
     }
   suspended = 0;
 }
+
+}
diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h
index d1bdea2..81d8ed2 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
@@ -77,4 +80,6 @@ 
   gdb::unique_xmalloc_ptr<char> name;
 };
 
+}
+
 #endif
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 1249778..776f151 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