Mercurial > hg > octave-lyh

changeset 16494:3a2daa39c682

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: periodic merge of stable to default
author John W. Eaton <jwe@octave.org>
date Thu, 11 Apr 2013 01:51:38 -0400
parents 91c32a702284 (current diff) f441dc7d1afd (diff)
children b98ad20e4880
files libinterp/parse-tree/pt-cbinop.cc libinterp/parse-tree/pt-cbinop.h
diffstat 2 files changed, 0 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-cbinop.cc
+++ b/libinterp/parse-tree/pt-cbinop.cc
@@ -190,34 +190,3 @@
 
   return ret;
 }
-
-octave_value
-tree_compound_binary_expression::rvalue1 (int)
-{
-  octave_value retval;
-
-  if (error_state)
-    return retval;
-
-  if (op_lhs)
-    {
-      octave_value a = op_lhs->rvalue1 ();
-
-      if (! error_state && a.is_defined () && op_rhs)
-        {
-          octave_value b = op_rhs->rvalue1 ();
-
-          if (! error_state && b.is_defined ())
-            {
-              retval = ::do_binary_op (etype, a, b);
-
-              if (error_state)
-                retval = octave_value ();
-            }
-        }
-    }
-
-  return retval;
-}
-
-
--- a/libinterp/parse-tree/pt-cbinop.h
+++ b/libinterp/parse-tree/pt-cbinop.h
@@ -50,8 +50,6 @@
     : tree_binary_expression (a, b, l, c, t), op_lhs (ca), op_rhs (cb),
       etype (ct) { }
 
-  octave_value rvalue1 (int nargout = 1);
-
   octave_value::compound_binary_op cop_type (void) const { return etype; }
 
 private: