[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b
pkienzle
pkienzle at 416fae20-06d0-4450-9b69-c6c34d4b5f03
Mon Jan 3 03:40:32 UTC 2011
The following commit has been merged in the master branch:
commit c59682060ad7e31bd5aa26f4d3ba099dedbc8408
Author: pkienzle <pkienzle at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date: Thu May 2 16:12:33 2002 +0000
use std::exception; make error blocks consistent in spacing, etc.
git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@402 416fae20-06d0-4450-9b69-c6c34d4b5f03
diff --git a/differentiate.cc b/differentiate.cc
index 85ff10d..d092d7a 100644
--- a/differentiate.cc
+++ b/differentiate.cc
@@ -79,9 +79,9 @@ supplied then a default value of 1 is used.\n\
retval = octave_value(new octave_ex(expression.diff(variable,order)));
}
- catch(exception &e)
+ catch (std::exception &e)
{
- error(e.what ());
+ error (e.what ());
retval = octave_value ();
}
diff --git a/probably_prime.cc b/probably_prime.cc
index fb92816..be81770 100644
--- a/probably_prime.cc
+++ b/probably_prime.cc
@@ -31,9 +31,9 @@ with error 1 in 2^100.\n\
}
retval(0) = GiNaC::is_prime(value);
}
- catch (exception e)
+ catch (std::exception &e)
{
- e.what ();
+ error (e.what ());
return retval;
}
return retval;
diff --git a/sym-create.cc b/sym-create.cc
index 91aec97..42054c5 100644
--- a/sym-create.cc
+++ b/sym-create.cc
@@ -60,9 +60,9 @@ is a number.\n\
retval = octave_value(new octave_vpa(d));
}
- catch (exception &e)
+ catch (std::exception &e)
{
- error(e.what());
+ error (e.what ());
retval = octave_value ();
}
@@ -87,9 +87,9 @@ Create an object of type symbol\n")
octave_sym x(xtmp);
retval = octave_value(new octave_sym(x));
}
- catch (exception &e)
+ catch (std::exception &e)
{
- error(e.what());
+ error (e.what ());
retval = octave_value ();
}
@@ -162,9 +162,9 @@ is a number.\n\
}
retval = octave_value(new octave_ex_matrix(a));
}
- catch (exception &e)
+ catch (std::exception &e)
{
- error(e.what());
+ error (e.what ());
retval = octave_value ();
}
diff --git a/sym-ops.h b/sym-ops.h
index 1dbbe20..f458aa0 100644
--- a/sym-ops.h
+++ b/sym-ops.h
@@ -47,9 +47,9 @@ void install_ex_matrix_ops(void);
return octave_value \
(new octave_ex_matrix (r1.op (r2))); \
} \
- catch (exception &e) \
+ catch (std::exception &e) \
{ \
- error(e.what()); \
+ error (e.what ()); \
return octave_value (); \
} \
}
@@ -70,9 +70,9 @@ void install_ex_matrix_ops(void);
return octave_value \
(new octave_ex_matrix (r2.transpose ().inverse ().mul (r1).transpose ())); \
} \
- catch (exception &e) \
+ catch (std::exception &e) \
{ \
- error(e.what()); \
+ error (e.what ()); \
return octave_value (); \
} \
}
@@ -94,9 +94,9 @@ void install_ex_matrix_ops(void);
return octave_value \
(new octave_ex_matrix (result)); \
} \
- catch (exception &e) \
+ catch (std::exception &e) \
{ \
- error(e.what()); \
+ error (e.what ()); \
return octave_value (); \
} \
}
@@ -118,9 +118,9 @@ void install_ex_matrix_ops(void);
return octave_value \
(new octave_ex_matrix (result)); \
} \
- catch (exception &e) \
+ catch (std::exception &e) \
{ \
- error(e.what()); \
+ error (e.what ()); \
return octave_value (); \
} \
}
@@ -142,9 +142,9 @@ void install_ex_matrix_ops(void);
return octave_value \
(new octave_ex_matrix (result)); \
} \
- catch (exception &e) \
+ catch (std::exception &e) \
{ \
- error(e.what()); \
+ error (e.what ()); \
return octave_value (); \
} \
}
@@ -161,9 +161,9 @@ void install_ex_matrix_ops(void);
return octave_value \
(new octave_ex (result)); \
} \
- catch (exception &e) \
+ catch (std::exception &e) \
{ \
- error(e.what()); \
+ error (e.what ()); \
return octave_value (); \
} \
}
@@ -180,9 +180,9 @@ void install_ex_matrix_ops(void);
return octave_value \
(new octave_ex (result)); \
} \
- catch (exception &e) \
+ catch (std::exception &e) \
{ \
- error(e.what()); \
+ error (e.what ()); \
return octave_value (); \
} \
}
diff --git a/symbols.cc b/symbols.cc
index e65bef1..e686c49 100644
--- a/symbols.cc
+++ b/symbols.cc
@@ -157,9 +157,9 @@ Convert a vpa, string, ex or string type to a double.\n\
retval = octave_value(num.to_double ());
}
- catch (exception &e)
+ catch (std::exception &e)
{
- error(e.what());
+ error (e.what ());
retval = octave_value ();
}
@@ -200,9 +200,9 @@ Change the precision for the vpa type\n\
retval = octave_value(dig);
}
- catch (exception &e)
+ catch (std::exception &e)
{
- error(e.what());
+ error (e.what ());
retval = octave_value ();
}
@@ -220,9 +220,9 @@ Pi evaluated to the current value of Digits\n\
{
retval = octave_value(new octave_vpa(GiNaC::ex_to<GiNaC::numeric>(GiNaC::Pi.evalf())));
}
- catch(exception &e)
+ catch (std::exception &e)
{
- error(e.what());
+ error (e.what ());
retval = octave_value ();
}
@@ -308,9 +308,9 @@ Substitute a number for a variables in an expression\n\
tmp = expression.subs(the_sym == ex_sub);
retval = octave_value (new octave_ex(tmp));
}
- catch (exception e)
+ catch (std::exception &e)
{
- e.what ();
+ error (e.what ());
retval = octave_value ();
}
@@ -357,9 +357,9 @@ Expand an expression\n\
result = expression.expand();
retval = octave_value(new octave_ex(result));
}
- catch (exception &e)
+ catch (std::exception &e)
{
- error(e.what ());
+ error (e.what ());
retval = octave_value ();
}
@@ -423,9 +423,9 @@ Obtain the @var{n}th coefficient of the variable @var{x} in @var{a}.
retval = octave_value (new octave_ex (expression.coeff(sym,n)));
}
- catch(exception &e)
+ catch (std::exception &e)
{
- error(e.what ());
+ error (e.what ());
retval = octave_value ();
}
@@ -482,9 +482,9 @@ collect the terms in @var{a} as a univariate polynomial in @var{x}\n\
retval = new octave_ex(expression.collect(the_sym));
}
- catch(exception &e)
+ catch (std::exception &e)
{
- error(e.what());
+ error (e.what ());
retval = octave_value ();
}
diff --git a/symbols.h b/symbols.h
index 009b278..29a8b79 100644
--- a/symbols.h
+++ b/symbols.h
@@ -32,9 +32,9 @@ Return the " description " of a symbolic expression.\n\
r = new octave_ex(GiNaC::ginac_name (expression)); \
retval = octave_value (r); \
} \
- catch (exception &e) \
+ catch (std::exception &e) \
{ \
- e.what (); \
+ error (e.what ()); \
retval = octave_value (); \
} \
\
@@ -78,10 +78,10 @@ Return the " description " of a symbolic expression.\n\
r = new octave_ex(expression.ginac_name(sym)); \
\
} \
- catch(exception &e) \
+ catch (std::exception &e) \
{ \
octave_value_list empty; \
- error(e.what()); \
+ error (e.what ()); \
return empty; \
} \
\
@@ -135,10 +135,10 @@ Return the " description " of a symbolic expression.\n\
r = new octave_ex(ginac_name (expression0, expression1, sym)); \
\
} \
- catch(exception &e) \
+ catch (std::exception &e) \
{ \
octave_value_list empty; \
- error(e.what()); \
+ error (e.what ()); \
return empty; \
}\
\
--
octave-symbolic
More information about the Pkg-octave-commit
mailing list