This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d018a8c8aac6cf99594dfadf5561b94f3de716b8 (commit)
via 73f255e29d2ac9b45106e9ba7c9bb20ff2ab4349 (commit)
from ed645b3a720e7d3df63aa39da3883a994e74a298 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d018a8c8aac6cf99594dfadf5561b94f3de716b8
commit d018a8c8aac6cf99594dfadf5561b94f3de716b8
Merge: ed645b3 73f255e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 4 09:14:40 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Nov 4 09:14:40 2015 -0500
Merge topic 'fortran-line-directives' into next
73f255e2 cmFortranLexer: Populate empty doxygen @param comments
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73f255e29d2ac9b45106e9ba7c9bb20ff2ab4349
commit 73f255e29d2ac9b45106e9ba7c9bb20ff2ab4349
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 4 09:12:36 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Nov 4 09:13:18 2015 -0500
cmFortranLexer: Populate empty doxygen @param comments
Re-apply the change from commit v3.0.0-rc1~554^2~2 (cm*Lexer: Populate
empty doxygen @param comment, 2013-09-19) after recent lexer generation.
diff --git a/Source/cmFortranLexer.cxx b/Source/cmFortranLexer.cxx
index bdb9f2a..6779c1a 100644
--- a/Source/cmFortranLexer.cxx
+++ b/Source/cmFortranLexer.cxx
@@ -2183,7 +2183,7 @@ void cmFortran_yyset_extra (YY_EXTRA_TYPE user_defined ,
yyscan_t yyscanner)
}
/** Set the current line number.
- * @param line_number
+ * @param line_number The line number to set.
* @param yyscanner The scanner object.
*/
void cmFortran_yyset_lineno (int line_number , yyscan_t yyscanner)
@@ -2198,7 +2198,7 @@ void cmFortran_yyset_lineno (int line_number , yyscan_t
yyscanner)
}
/** Set the current column.
- * @param line_number
+ * @param column_no The column number to set.
* @param yyscanner The scanner object.
*/
void cmFortran_yyset_column (int column_no , yyscan_t yyscanner)
-----------------------------------------------------------------------
Summary of changes:
Source/cmFortranLexer.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
