From: Pedro Alves <palves@redhat.com>
To: gdb-patches@sourceware.org
Subject: [pushed] Avoid using 'private' C++ keyword as symbol
Date: Fri, 15 May 2015 15:17:00 -0000 [thread overview]
Message-ID: <1431703031-30871-1-git-send-email-palves@redhat.com> (raw)
gdb/ChangeLog:
2015-05-15 Pedro Alves <palves@redhat.com>
* linux-tdep.c (linux_find_memory_regions_full): Rename local
'private' to 'priv'.
---
gdb/ChangeLog | 5 +++++
gdb/linux-tdep.c | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 63c015f..05c0b3f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2015-05-15 Pedro Alves <palves@redhat.com>
+ * linux-tdep.c (linux_find_memory_regions_full): Rename local
+ 'private' to 'priv'.
+
+2015-05-15 Pedro Alves <palves@redhat.com>
+
* nat/linux-nat.h: Include "target/waitstatus.h".
2015-05-15 Yuanhui Zhang <asmwarrior@gmail.com>
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index 9d75b66..df42097 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -1163,7 +1163,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch,
const char *permissions, *device, *filename;
struct smaps_vmflags v;
size_t permissions_len, device_len;
- int read, write, exec, private;
+ int read, write, exec, priv;
int has_anonymous = 0;
int should_dump_p = 0;
int mapping_anon_p;
@@ -1197,7 +1197,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch,
not have the VmFlags there. In this case, there is
really no way to know if we are dealing with VM_SHARED,
so we just assume that VM_MAYSHARE is enough. */
- private = memchr (permissions, 'p', permissions_len) != 0;
+ priv = memchr (permissions, 'p', permissions_len) != 0;
/* Try to detect if region should be dumped by parsing smaps
counters. */
@@ -1257,7 +1257,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch,
}
if (has_anonymous)
- should_dump_p = dump_mapping_p (filterflags, &v, private,
+ should_dump_p = dump_mapping_p (filterflags, &v, priv,
mapping_anon_p, mapping_file_p,
filename);
else
--
1.9.3
reply other threads:[~2015-05-15 15:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431703031-30871-1-git-send-email-palves@redhat.com \
--to=palves@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).