# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1235470358 -3600
# Node ID a909d8c01adfc9f341ae8e258dc8537dd187f098
# Parent  97d146d1648b9bb3ebb0784dd99b671133f4d303
remove duplicate conversions in OPERATORS

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -20,6 +20,9 @@
 	(octave_float_scalar::uint32_scalar_value): New method.
 	(octave_float_scalar::uint64_scalar_value): New method.
 
+	* OPERATORS/op-s-s.cc (scalar_to_float): Remove duplicate conversion.
+	* OPERATORS/op-range.cc (range_to_float_matrix): Ditto.
+
 2009-02-24  John W. Eaton  <jwe@octave.org>
 
 	* OPERATORS/op-float-conv.cc: New file.
diff --git a/src/OPERATORS/op-range.cc b/src/OPERATORS/op-range.cc
--- a/src/OPERATORS/op-range.cc
+++ b/src/OPERATORS/op-range.cc
@@ -83,13 +83,6 @@
 DEFNDCATOP_FN (bm_r, bool_matrix, range, array, array, concat)
 DEFNDCATOP_FN (chm_r, char_matrix, range, char_array, array, concat)
 
-CONVDECL (range_to_float_matrix)
-{
-  CAST_CONV_ARG (const octave_range&);
-
-  return new octave_float_matrix (FloatNDArray (v.array_value ()));
-}
-
 CONVDECL (range_to_matrix)
 {
   CAST_CONV_ARG (const octave_range&);
@@ -129,8 +122,6 @@
   INSTALL_CATOP (octave_bool_matrix, octave_range, bm_r);
   INSTALL_CATOP (octave_char_matrix, octave_range, chm_r);
 
-  INSTALL_CONVOP (octave_range, octave_float_matrix, range_to_float_matrix);
-
   // FIXME -- this would be unneccessary if
   // octave_base_value::numeric_assign always tried converting lhs
   // before rhs.
diff --git a/src/OPERATORS/op-s-s.cc b/src/OPERATORS/op-s-s.cc
--- a/src/OPERATORS/op-s-s.cc
+++ b/src/OPERATORS/op-s-s.cc
@@ -121,13 +121,6 @@
 
 DEFNDCATOP_FN (s_s, scalar, scalar, array, array, concat)
 
-CONVDECL (scalar_to_float)
-{
-  CAST_CONV_ARG (const octave_scalar&);
-
-  return new octave_float_matrix (FloatMatrix (1, 1, static_cast<float>(v.double_value ())));
-}
-
 void
 install_s_s_ops (void)
 {
@@ -167,8 +160,6 @@
   INSTALL_ASSIGNCONV (octave_scalar, octave_null_matrix, octave_matrix);
   INSTALL_ASSIGNCONV (octave_scalar, octave_null_str, octave_matrix);
   INSTALL_ASSIGNCONV (octave_scalar, octave_null_sq_str, octave_matrix);
-
-  INSTALL_CONVOP (octave_scalar, octave_float_matrix, scalar_to_float);
 }
 
 /*