aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Koenig <tkoenig@gcc.gnu.org>2017-12-12 19:29:53 +0000
committerThomas Koenig <tkoenig@gcc.gnu.org>2017-12-12 19:29:53 +0000
commit8eedea2cde1a19afffad9349116ae53292179f13 (patch)
treee72e8a2ca98a58c41097f01efcf6ebd0b42e4db3
parentbe194538964c744d1d93a58498fead069c122fc7 (diff)
downloadgcc-8eedea2cde1a19afffad9349116ae53292179f13.zip
gcc-8eedea2cde1a19afffad9349116ae53292179f13.tar.gz
gcc-8eedea2cde1a19afffad9349116ae53292179f13.tar.bz2
intrinsic.texi (MAXLOC): Remove double description of return value.
2017-12-12 Thomas Koenig <tkoenig@gcc.gnu.org> * intrinsic.texi (MAXLOC): Remove double description of return value. (MINLOC): Likewise. From-SVN: r255587
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/intrinsic.texi18
2 files changed, 14 insertions, 10 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ca20af3..f3f9d9c 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-12 Thomas Koenig <tkoenig@gcc.gnu.org>
+
+ * intrinsic.texi (MAXLOC): Remove double description
+ of return value.
+ (MINLOC): Likewise.
+
2017-12-11 Thomas Koenig <tkoenig@gcc.gnu.org>
* intrinsic.texi (MAXLOC): Update documentation for
diff --git a/gcc/fortran/intrinsic.texi b/gcc/fortran/intrinsic.texi
index d813945..58ace82 100644
--- a/gcc/fortran/intrinsic.texi
+++ b/gcc/fortran/intrinsic.texi
@@ -9994,9 +9994,7 @@ that of the first such element in array element order. If the array has
zero size, or all of the elements of @var{MASK} are @code{.FALSE.}, then
the result is an array of zeroes. Similarly, if @var{DIM} is supplied
and all of the elements of @var{MASK} along a given row are zero, the
-result value for that row is zero. If the optional argument @var{KIND}
-is present, the result is an integer of kind @var{KIND}, otherwise it is of
-default kind.
+result value for that row is zero.
@item @emph{Standard}:
Fortran 95 and later; @var{ARRAY} of @code{CHARACTER} and the
@@ -10030,8 +10028,9 @@ equal to the rank of @var{ARRAY}. If @var{DIM} is present, the result
is an array with a rank one less than the rank of @var{ARRAY}, and a
size corresponding to the size of @var{ARRAY} with the @var{DIM}
dimension removed. If @var{DIM} is present and @var{ARRAY} has a rank
-of one, the result is a scalar. In all cases, the result is of default
-@code{INTEGER} type.
+of one, the result is a scalar. If the optional argument @var{KIND}
+is present, the result is an integer of kind @var{KIND}, otherwise it
+is of default kind.
@item @emph{See also}:
@ref{MAX}, @ref{MAXVAL}
@@ -10347,9 +10346,7 @@ that of the first such element in array element order. If the array has
zero size, or all of the elements of @var{MASK} are @code{.FALSE.}, then
the result is an array of zeroes. Similarly, if @var{DIM} is supplied
and all of the elements of @var{MASK} along a given row are zero, the
-result value for that row is zero. If the optional argument @var{KIND}
-is present, the result is an integer of kind @var{KIND}, otherwise it is of
-default kind.
+result value for that row is zero.
@item @emph{Standard}:
Fortran 95 and later; @var{ARRAY} of @code{CHARACTER} and the
@@ -10383,8 +10380,9 @@ equal to the rank of @var{ARRAY}. If @var{DIM} is present, the result
is an array with a rank one less than the rank of @var{ARRAY}, and a
size corresponding to the size of @var{ARRAY} with the @var{DIM}
dimension removed. If @var{DIM} is present and @var{ARRAY} has a rank
-of one, the result is a scalar. In all cases, the result is of default
-@code{INTEGER} type.
+of one, the result is a scalar. If the optional argument @var{KIND}
+is present, the result is an integer of kind @var{KIND}, otherwise it
+is of default kind.
@item @emph{See also}:
@ref{MIN}, @ref{MINVAL}