From 2ffbee0e0b8b8b4d3015b5af63d8da7ac28949cb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 2 Jun 2003 08:19:08 +0000 Subject: [PATCH] (yy::Position::lines, yy::Position::columns, yy::Location::lines, yy::Location::columns): Rename arguments to avoid shadowing; this removes a warning generated by GCC 3.3. --- data/lalr1.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/data/lalr1.cc b/data/lalr1.cc index 16162d3e..2e6947bc 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -954,20 +954,20 @@ namespace yy /** \name Line and Column related manipulators ** \{ */ public: - /** \brief (line related) Advance to the LINES next lines. */ - inline void lines (int lines = 1) + /** \brief (line related) Advance to the COUNT next lines. */ + inline void lines (int count = 1) { column = initial_column; - line += lines; + line += count; } - /** \brief (column related) Advance to the COLUMNS next columns. */ - inline void columns (int columns = 1) + /** \brief (column related) Advance to the COUNT next columns. */ + inline void columns (int count = 1) { int leftmost = initial_column; int current = column; - if (leftmost <= current + columns) - column += columns; + if (leftmost <= current + count) + column += count; else column = initial_column; } @@ -1068,16 +1068,16 @@ namespace yy begin = end; } - /** \brief Extend the current location to the COLUMNS next columns. */ - inline void columns (unsigned columns = 1) + /** \brief Extend the current location to the COUNT next columns. */ + inline void columns (unsigned int count = 1) { - end += columns; + end += count; } - /** \brief Extend the current location to the LINES next lines. */ - inline void lines (unsigned lines = 1) + /** \brief Extend the current location to the COUNT next lines. */ + inline void lines (unsigned int count = 1) { - end.lines (lines); + end.lines (count); } /** \} */ -- 2.45.2