Index: mttroot/mtt/cc/include/Bracket.hh ================================================================== --- mttroot/mtt/cc/include/Bracket.hh +++ mttroot/mtt/cc/include/Bracket.hh @@ -1,7 +1,10 @@ /* $Id$ * $Log$ + * Revision 1.1 2000/12/28 09:47:29 peterg + * put under RCS + * * Revision 1.1 2000/10/31 04:29:11 geraint * Initial revision * */ @@ -9,10 +12,11 @@ #include #include +using namespace std; class Bracket { public: friend ostream &operator<< (ostream &str, Bracket *b); Index: mttroot/mtt/cc/include/useful-functions.hh ================================================================== --- mttroot/mtt/cc/include/useful-functions.hh +++ mttroot/mtt/cc/include/useful-functions.hh @@ -47,11 +47,11 @@ nozeros (const ColumnVector v0, const double tol = 0.0) { ColumnVector v (v0.length ()); register int i, j; for (i = j = 0; i < v.length (); i++) - if (tol < abs (v0 (i))) + if (tol < std::abs (v0 (i))) { v (j) = v0 (i); j++; } if (0 == j) Index: mttroot/mtt/cc/parse_m2cc.cc ================================================================== --- mttroot/mtt/cc/parse_m2cc.cc +++ mttroot/mtt/cc/parse_m2cc.cc @@ -1,7 +1,10 @@ /* $Id$ * $Log$ + * Revision 1.2 2001/03/19 02:28:53 geraint + * Branch merge: merging-ode2odes-exe back to MAIN. + * * Revision 1.1.2.2 2001/03/09 04:01:20 geraint * \ escapes newline. * * Revision 1.1.2.1 2001/03/09 02:59:26 geraint * got_comment: (char)c no longer compared to (int)EOF. @@ -28,10 +31,12 @@ * just add Bracket pointer to string / stream */ #include "Bracket.hh" + +using namespace std; /* * use lbrace, etc. in expressions to automate nesting calculations */ LeftBrace *lbrace = new LeftBrace;