changeset 3054:788799701ecb

[project @ 1997-06-15 21:29:31 by jwe]
author jwe
date Sun, 15 Jun 1997 21:30:30 +0000
parents f05a02fbe3c9
children c4378ede0bec
files octMakefile.in src/ChangeLog src/OPERATORS/op-cs-s.cc
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -31,7 +31,7 @@
 	ChangeLog ChangeLog.[0-9]
 
 # Complete directory trees to distribute.
-DISTDIRS = glob kpathsea # plplot
+DISTDIRS = glob kpathsea kpathsea # plplot
 
 # Subdirectories in which to run `make all'.
 SUBDIRS = @INFO_DIR@ @PLPLOT_DIR@ @READLINE_DIR@ @DLFCN_DIR@ glob \
@@ -45,7 +45,7 @@
 CONF_DISTSUBDIRS = src
 
 # Subdirectories in which to run `make dist'.
-DISTSUBDIRS = libcruft liboctave info readline dlfcn src scripts \
+DISTSUBDIRS = libcruft liboctave info dlfcn src scripts \
 	test doc emacs examples
 
 XBINDISTFILES = BUGS COPYING INSTALL INSTALL.OCTAVE NEWS NEWS.[0-9] \
@@ -57,8 +57,7 @@
 	octave-bug config.status config.h VERSION ARCH
 
 # Subdirectories in which to run `make bin-dist'.
-BINDISTSUBDIRS = libcruft liboctave src kpathsea readline info \
-	scripts doc emacs examples
+BINDISTSUBDIRS = libcruft liboctave src info scripts doc emacs examples
 
 # Subdirectories in which to run clean targets.
 CLEANSUBDIRS = $(DISTSUBDIRS) glob kpathsea
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 Sun Jun 15 16:11:13 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* OPERATORS/op-cs-s.cc (ldiv): Doh, v1 is complex, v2 is real.
+
 	* Makefile.in (DISTFILES): Add mkops to the list.
 	(dist): Correctly link files in DLD-FUNCTIONS, OPERATORS, and
 	TEMPLATE-INST subdirectories.
--- a/src/OPERATORS/op-cs-s.cc
+++ b/src/OPERATORS/op-cs-s.cc
@@ -62,12 +62,12 @@
 {
   CAST_BINOP_ARGS (const octave_complex&, const octave_scalar&);
 
-  double d = v1.double_value ();
+  double d = v1.complex_value ();
 
   if (d == 0.0)
     gripe_divide_by_zero ();
 
-  return octave_value (v2.complex_value () / d);
+  return octave_value (v2.double_value () / d);
 }
 
 DEFBINOP (lt, complex, scalar)