[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b
bensapp
bensapp at 416fae20-06d0-4450-9b69-c6c34d4b5f03
Mon Jan 3 03:40:07 UTC 2011
The following commit has been merged in the master branch:
commit 8123716bc486fa277d9616600ae27baa91ac8704
Author: bensapp <bensapp at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date: Thu Jan 3 23:20:34 2002 +0000
Finished converting ex_to_type functions to ex_to<GiNaC::type> functions
required by newer versions of GiNaC.
git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@105 416fae20-06d0-4450-9b69-c6c34d4b5f03
diff --git a/ov-sym.cc b/ov-sym.cc
index 34debb1..2ec1d9a 100644
--- a/ov-sym.cc
+++ b/ov-sym.cc
@@ -121,7 +121,7 @@ DEFBINOP_POW(sym_ex_pow,sym,ex)
GiNaC::symbol octave_sym::sym_value() const
{
// This is ugly
- return ex_to_symbol(GiNaC::ex(*(x.duplicate ())));
+ return GiNaC::ex_to<GiNaC::symbol>(GiNaC::ex(*(x.duplicate ())));
}
void
diff --git a/ov-vpa.h b/ov-vpa.h
index 7b98ab1..4072694 100644
--- a/ov-vpa.h
+++ b/ov-vpa.h
@@ -59,7 +59,7 @@ public:
octave_vpa( const GiNaC::ex& x):octave_base_value()
{
- scalar = GiNaC::ex_to_numeric(x);
+ scalar = GiNaC::ex_to<GiNaC::numeric>(x);
}
~octave_vpa (void) { }
diff --git a/symbols.cc b/symbols.cc
index 8e456c2..44fad0d 100644
--- a/symbols.cc
+++ b/symbols.cc
@@ -229,7 +229,7 @@ Pi evaluated to the current value of Digits\n\
\n\
@seealso{digits}")
{
- return octave_value(new octave_vpa(GiNaC::ex_to_numeric(GiNaC::Pi.evalf())));
+ return octave_value(new octave_vpa(GiNaC::ex_to<GiNaC::numeric>(GiNaC::Pi.evalf())));
}
DEFUN_DLD(is_vpa, args, ,
--
octave-symbolic
More information about the Pkg-octave-commit
mailing list