Mercurial > hg > octave-nkf

changeset 3012:0ea30e0e86cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-06-02 18:57:07 by jwe]
author jwe
date Mon, 02 Jun 1997 18:58:13 +0000
parents 2ad9af85b89b
children 66a1cede95e7
files ChangeLog configure.in liboctave/ChangeLog liboctave/lo-mappers.cc
diffstat 4 files changed, 26 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun  2 13:56:26 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: Move checks for RANLIB, AR, and ARFLAGS before
+	checks for libf2c.
+
 Fri May 30 14:59:59 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: Fix typo in check for $with_f77.
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.269 $)
+AC_REVISION($Revision: 1.270 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -311,6 +311,20 @@
 fi
 AC_SUBST(LD_STATIC_FLAG)
 
+### We need these before trying to find libf2c.
+
+if test -z "$AR"; then
+  AR=ar
+fi
+AC_SUBST(AR)
+
+if test -z "$ARFLAGS"; then
+  ARFLAGS="rc"
+fi
+AC_SUBST(ARFLAGS)
+
+AC_PROG_RANLIB
+
 ### If we haven't been forced to use a particular Fortran compiler,
 ### try to find one using any one of several common Un*x Fortran
 ### compiler names.  Put fc last to avoid confusion with some vendor's
@@ -410,7 +424,6 @@
   fi
 fi
 
-
 f77_rules_frag=/dev/null
 if $have_fortran_compiler; then
   f77_rules_frag=Makefrag.f77
@@ -661,20 +674,6 @@
 
 OCTAVE_STRING_NPOS
 
-### We need these before trying to find libf2c.
-
-if test -z "$AR"; then
-  AR=ar
-fi
-AC_SUBST(AR)
-
-if test -z "$ARFLAGS"; then
-  ARFLAGS="rc"
-fi
-AC_SUBST(ARFLAGS)
-
-AC_PROG_RANLIB
-
 ### Checks for header files.
 
 AC_HEADER_STDC
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun  2 12:44:14 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* lo-mappers.cc (fix): Use floor and ceil instead of casting to int.
+
 Thu May 22 16:20:43 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* cmd-edit.h, cmd-edit.cc: Rename set_paren_string_delimiters to
--- a/liboctave/lo-mappers.cc
+++ b/liboctave/lo-mappers.cc
@@ -83,7 +83,7 @@
 double
 fix (double x)
 {
-  return static_cast<int> (x);
+  return x > 0 ? floor (x) : ceil (x);
 }
 
 double
@@ -277,8 +277,7 @@
 Complex
 fix (const Complex& x)
 {
-  return Complex (static_cast<int> (real (x)),
-		  static_cast<int> (imag (x)));
+  return Complex (fix (real (x)), fix (imag (x)));
 }
 
 Complex