This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 6/9] Rename "lines" parameter in source-cache.h
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Tue, 22 Jan 2019 01:04:42 -0700
- Subject: [PATCH 6/9] Rename "lines" parameter in source-cache.h
- References: <20190122080445.32658-1-tom@tromey.com>
A compile in the TUI somehow had "lines" defined as a macro. This
caused a compile error when including source-cache.h after whatever
header did that. I didn't track this down, but rather just changed
source-cache.h to avoid the clash.
2019-01-21 Tom Tromey <tom@tromey.com>
* source-cache.h (class source_cache) <get_source_lines,
get_plain_source_lines, extract_lines>: Rename "lines" parameter.
---
gdb/ChangeLog | 5 +++++
gdb/source-cache.h | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/gdb/source-cache.h b/gdb/source-cache.h
index b6656e035e..dd23266e25 100644
--- a/gdb/source-cache.h
+++ b/gdb/source-cache.h
@@ -36,10 +36,10 @@ public:
/* Get the source text for the source file in symtab S. FIRST_LINE
and LAST_LINE are the first and last lines to return; line
numbers are 1-based. If the file cannot be read, false is
- returned. Otherwise, LINES is set to the desired text. The
+ returned. Otherwise, LINES_OUT is set to the desired text. The
returned text may include ANSI terminal escapes. */
bool get_source_lines (struct symtab *s, int first_line,
- int last_line, std::string *lines);
+ int last_line, std::string *lines_out);
/* Remove all the items from the source cache. */
void clear ()
@@ -62,12 +62,12 @@ private:
source lines are not highlighted. The arguments and return value
are as for get_source_lines. */
bool get_plain_source_lines (struct symtab *s, int first_line,
- int last_line, std::string *lines);
+ int last_line, std::string *lines_out);
/* A helper function for get_plain_source_lines that extracts the
- desired source lines from TEXT, putting them into LINES. The
+ desired source lines from TEXT, putting them into LINES_OUT. The
arguments and return value are as for get_source_lines. */
bool extract_lines (const struct source_text &text, int first_line,
- int last_line, std::string *lines);
+ int last_line, std::string *lines_out);
/* The contents of the cache. */
std::vector<source_text> m_source_map;
--
2.17.2