From c843de3c75bdc658eda42994811223b2e79399f1 Mon Sep 17 00:00:00 2001 From: jvdelisle Date: Sun, 1 Jun 2008 00:30:37 +0000 Subject: [PATCH] 2008-05-31 Jerry DeLisle * intrinsic.texi: Revert wrong commit. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136249 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 4 ++++ gcc/fortran/intrinsic.texi | 39 --------------------------------------- 2 files changed, 4 insertions(+), 39 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 02861b6..a928c25 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2008-05-31 Jerry DeLisle + + * intrinsic.texi: Revert wrong commit. + 2008-05-31 Steven G. Kargl * arith.c (gfc_arith_init_1): Remove now unused r and c variables. diff --git a/gcc/fortran/intrinsic.texi b/gcc/fortran/intrinsic.texi index 58c5e4d..6852d64 100644 --- a/gcc/fortran/intrinsic.texi +++ b/gcc/fortran/intrinsic.texi @@ -1005,29 +1005,16 @@ Function @item @emph{Arguments}: @multitable @columnfractions .15 .70 -<<<<<<< .mine -@item @var{I} @tab The type shall be either a scalar @code{INTEGER(*)} -type or a scalar @code{LOGICAL} type. -@item @var{J} @tab The type shall be the same as the type of @var{I}. -======= @item @var{I} @tab The type shall be either a scalar @code{INTEGER} type or a scalar @code{LOGICAL} type. @item @var{J} @tab The type shall be the same as the type of @var{I}. ->>>>>>> .r136053 @end multitable @item @emph{Return value}: -<<<<<<< .mine -The return type is either a scalar @code{INTEGER(*)} or a scalar -@code{LOGICAL}. If the kind type parameters differ, then the -smaller kind type is implicitly converted to larger kind, and the -return has the larger kind. -======= The return type is either a scalar @code{INTEGER} or a scalar @code{LOGICAL}. If the kind type parameters differ, then the smaller kind type is implicitly converted to larger kind, and the return has the larger kind. ->>>>>>> .r136053 @item @emph{Example}: @smallexample @@ -8323,29 +8310,16 @@ Function @item @emph{Arguments}: @multitable @columnfractions .15 .70 -<<<<<<< .mine -@item @var{X} @tab The type shall be either a scalar @code{INTEGER(*)} -type or a scalar @code{LOGICAL} type. -@item @var{Y} @tab The type shall be the same as the type of @var{X}. -======= @item @var{X} @tab The type shall be either a scalar @code{INTEGER} type or a scalar @code{LOGICAL} type. @item @var{Y} @tab The type shall be the same as the type of @var{X}. ->>>>>>> .r136053 @end multitable @item @emph{Return value}: -<<<<<<< .mine -The return type is either a scalar @code{INTEGER(*)} or a scalar -@code{LOGICAL}. If the kind type parameters differ, then the -smaller kind type is implicitly converted to larger kind, and the -return has the larger kind. -======= The return type is either a scalar @code{INTEGER} or a scalar @code{LOGICAL}. If the kind type parameters differ, then the smaller kind type is implicitly converted to larger kind, and the return has the larger kind. ->>>>>>> .r136053 @item @emph{Example}: @smallexample @@ -11081,29 +11055,16 @@ Function @item @emph{Arguments}: @multitable @columnfractions .15 .70 -<<<<<<< .mine -@item @var{X} @tab The type shall be either a scalar @code{INTEGER(*)} -type or a scalar @code{LOGICAL} type. -@item @var{Y} @tab The type shall be the same as the type of @var{I}. -======= @item @var{X} @tab The type shall be either a scalar @code{INTEGER} type or a scalar @code{LOGICAL} type. @item @var{Y} @tab The type shall be the same as the type of @var{I}. ->>>>>>> .r136053 @end multitable @item @emph{Return value}: -<<<<<<< .mine -The return type is either a scalar @code{INTEGER(*)} or a scalar -@code{LOGICAL}. If the kind type parameters differ, then the -smaller kind type is implicitly converted to larger kind, and the -return has the larger kind. -======= The return type is either a scalar @code{INTEGER} or a scalar @code{LOGICAL}. If the kind type parameters differ, then the smaller kind type is implicitly converted to larger kind, and the return has the larger kind. ->>>>>>> .r136053 @item @emph{Example}: @smallexample -- 2.7.4