Rename "lines" parameter in source-cache.h

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 tracked this down to a #define in
/usr/include/term.h, so I just changed source-cache.h to avoid the
clash.

gdb/ChangeLog
2019-01-22  Tom Tromey  <tom@tromey.com>

	* source-cache.h (class source_cache) <get_source_lines,
	get_plain_source_lines, extract_lines>: Rename "lines" parameter.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 44ec0a6c036e771926f9d70d47e484d1fa1c937e..d9d6d403f551d5376c1b8fc4f941ea7235871920 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-22  Tom Tromey  <tom@tromey.com>
+
+       * source-cache.h (class source_cache) <get_source_lines,
+       get_plain_source_lines, extract_lines>: Rename "lines" parameter.
+
 2019-01-22  Tom Tromey  <tom@tromey.com>
 
        * remote-fileio.h (struct remote_target): Declare.

diff --git a/gdb/source-cache.h b/gdb/source-cache.h
index b6656e035eed963949b87151ba906c62e5dc6a45..dd23266e2530158b61ee263446cadfebb3fc2c61 100644 (file)
--- 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;