- Inserted some more std:: to make it compile under GCC2.96.

diff --git a/ginac/add.cpp b/ginac/add.cpp
index fa42153072269da7dd6cad27d134fae1e350b594..2b1c5d77ab84a3a54f2d089e406a037b5d09b553 100644 (file)
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -567,7 +567,7 @@ unsigned add::precedence = 40;
 //////////
 
 const add some_add;
-const type_info & typeid_add = typeid(some_add);
+const std::type_info & typeid_add = typeid(some_add);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/add.h b/ginac/add.h
index 4e63665db52c0f3af30bc3e0b1dceabf33da191c..e5c687b9e4ba30edd8bc31929f7cc01dbe8a1a8d 100644 (file)
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -108,7 +108,7 @@ protected:
 // global constants
 
 extern const add some_add;
-extern const type_info & typeid_add;
+extern const std::type_info & typeid_add;
 
 // utility functions
 inline const add &ex_to_add(const ex &e)

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index 171766c98678ff8678bd7244ce98d5cc4ee1e532..ff8e755fd5094a54d08772ebd8f63f3ce306801d 100644 (file)
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -224,7 +224,7 @@ std::ostream &operator<<(std::ostream &os, const archive &ar)
        unsigned int num_atoms = ar.atoms.size();
        write_unsigned(os, num_atoms);
        for (unsigned int i=0; i<num_atoms; i++)
-               os << ar.atoms[i] << ends;
+               os << ar.atoms[i] << std::ends;
 
        // Write expressions
        unsigned int num_exprs = ar.exprs.size();
@@ -526,11 +526,11 @@ void archive::printraw(std::ostream &os) const
                std::vector<std::string>::const_iterator i = atoms.begin(), iend = atoms.end();
                archive_atom id = 0;
                while (i != iend) {
-                       os << " " << id << " " << *i << endl;
+                       os << " " << id << " " << *i << std::endl;
                        i++; id++;
                }
        }
-       os << endl;
+       os << std::endl;
 
        // Dump expressions
        os << "Expressions:\n";
@@ -538,11 +538,11 @@ void archive::printraw(std::ostream &os) const
                std::vector<archived_ex>::const_iterator i = exprs.begin(), iend = exprs.end();
                unsigned int index = 0;
                while (i != iend) {
-                       os << " " << index << " \"" << unatomize(i->name) << "\" root node " << i->root << endl;
+                       os << " " << index << " \"" << unatomize(i->name) << "\" root node " << i->root << std::endl;
                        i++; index++;
                }
        }
-       os << endl;
+       os << std::endl;
 
        // Dump nodes
        os << "Nodes:\n";
@@ -577,7 +577,7 @@ void archive_node::printraw(std::ostream &os) const
                        case PTYPE_NODE: os << "node"; break;
                        default: os << "<unknown>"; break;
                }
-               os << " \"" << a.unatomize(i->name) << "\" " << i->value << endl;
+               os << " \"" << a.unatomize(i->name) << "\" " << i->value << std::endl;
                i++;
        }
 }

diff --git a/ginac/basic.cpp b/ginac/basic.cpp
index 8dcf58433e54a41605dbc31b7b8f3a4a6ad5b859..6d1f18a30b71fd141241f1f942d97c0b954160fb 100644 (file)
--- a/ginac/basic.cpp
+++ b/ginac/basic.cpp
@@ -538,7 +538,7 @@ unsigned basic::delta_indent = 4;
 //////////
 
 const basic some_basic;
-const type_info & typeid_basic=typeid(some_basic);
+const std::type_info & typeid_basic = typeid(some_basic);
 
 //////////
 // global variables

diff --git a/ginac/basic.h b/ginac/basic.h
index eb30fd19a3398d5af64735ee04116157177a9e14..3a604b5df53da09a4650af5e4bfcdd8087659dd2 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -185,7 +185,7 @@ private:
 // global constants
 
 extern const basic some_basic;
-extern const type_info & typeid_basic;
+extern const std::type_info & typeid_basic;
 
 // global variables
 

diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp
index 02aff19b6ea0b9a11b675470924d79b50b50ed86..fc6604dcecbe3c865c73e5554c12533031cab3b2 100644 (file)
--- a/ginac/clifford.cpp
+++ b/ginac/clifford.cpp
@@ -212,7 +212,7 @@ unsigned clifford::next_serial=0;
 //////////
 
 const clifford some_clifford;
-const type_info & typeid_clifford=typeid(some_clifford);
+const std::type_info & typeid_clifford = typeid(some_clifford);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/clifford.h b/ginac/clifford.h
index efb813de48c053631541609f2ebcd69586d9d010..80c13422f578134ae5b0bbc1e49baa5b1fcac23f 100644 (file)
--- a/ginac/clifford.h
+++ b/ginac/clifford.h
@@ -84,7 +84,7 @@ private:
 // global constants
 
 extern const clifford some_clifford;
-extern const type_info & typeid_clifford;
+extern const std::type_info & typeid_clifford;
 
 // utility functions
 inline const clifford &ex_to_clifford(const ex &e)

diff --git a/ginac/color.cpp b/ginac/color.cpp
index 34c3a85f32166c10de8b8b65a6f0804e7d5b9ebc..ca978963fe7b81281df3aa756e440eb716445dca 100644 (file)
--- a/ginac/color.cpp
+++ b/ginac/color.cpp
@@ -652,7 +652,7 @@ bool color::all_of_type_coloridx(void) const
 //////////
 
 const color some_color;
-const type_info & typeid_color=typeid(some_color);
+const std::type_info & typeid_color = typeid(some_color);
 
 //////////
 // friend functions

diff --git a/ginac/color.h b/ginac/color.h
index 299b3be8c885cbeadb4bb30ed71c6001659c8437..0812dce87577e3f0a08d3bd2e1aa380d168976cf 100644 (file)
--- a/ginac/color.h
+++ b/ginac/color.h
@@ -134,7 +134,7 @@ protected:
 // global constants
 
 extern const color some_color;
-extern const type_info & typeid_color;
+extern const std::type_info & typeid_color;
 
 // global functions
 inline const color &ex_to_color(const ex &e)

diff --git a/ginac/coloridx.cpp b/ginac/coloridx.cpp
index b3a409a29068baa1ed9900d2293acaf2da431a80..4831aada26c83d6d17a0bdb45dc066d3b488c482 100644 (file)
--- a/ginac/coloridx.cpp
+++ b/ginac/coloridx.cpp
@@ -239,7 +239,7 @@ bool coloridx::info(unsigned inf) const
 //////////
 
 const coloridx some_coloridx;
-const type_info & typeid_coloridx=typeid(some_coloridx);
+const std::type_info & typeid_coloridx = typeid(some_coloridx);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 37b8214374bcd7d1f3dd0668371c8d6d5945b065..23d806b08cb2830518dcaed78844e6680b4d456b 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -78,7 +78,7 @@ public:
 // global constants
 
 extern const coloridx some_coloridx;
-extern const type_info & typeid_coloridx;
+extern const std::type_info & typeid_coloridx;
 
 // utility functions
 inline const coloridx &ex_to_coloridx(const ex &e)

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 25efe77300bfd41dcb77293ffab95d75f2c20ea9..60ccc6a128306277af395b17f11f354dca1b8dcb 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -235,7 +235,7 @@ unsigned constant::next_serial=0;
 //////////
 
 const constant some_constant;
-const type_info & typeid_constant=typeid(some_constant);
+const std::type_info & typeid_constant = typeid(some_constant);
 
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
 const constant Pi("Pi", PiEvalf);

diff --git a/ginac/constant.h b/ginac/constant.h
index 47f2a9d610d24101be1cec94d4f33d61c4dd6bfe..f8c5633d7b563e7cff46a6181c5552ce74f24a42 100644 (file)
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -90,7 +90,7 @@ private:
 // global constants
 
 extern const constant some_constant;
-extern const type_info & typeid_constant;
+extern const std::type_info & typeid_constant;
 
 extern const constant Pi;
 extern const constant Catalan;

diff --git a/ginac/container.pl b/ginac/container.pl
index f642e4114c33f13b217dd2340a0cf4193f4f9c28..114da65289729c58ecbb314bec68d8246268d79d 100755 (executable)
--- a/ginac/container.pl
+++ b/ginac/container.pl
@@ -255,7 +255,7 @@ protected:
 // global constants
 
 extern const ${CONTAINER} some_${CONTAINER};
-extern const type_info & typeid_${CONTAINER};
+extern const std::type_info & typeid_${CONTAINER};
 
 // utility functions
 inline const ${CONTAINER} &ex_to_${CONTAINER}(const ex &e)
@@ -793,7 +793,7 @@ unsigned ${CONTAINER}::precedence=10;
 //////////
 
 const ${CONTAINER} some_${CONTAINER};
-const type_info & typeid_${CONTAINER}=typeid(some_${CONTAINER});
+const std::type_info & typeid_${CONTAINER} = typeid(some_${CONTAINER});
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index 5a52efe1edf59d8364dccf19dc3d87d5911b90fe..f79663960cd3aa39e808004dcfb52b20f9e116ce 100644 (file)
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -1522,16 +1522,16 @@ bool expairseq::is_canonical() const
                                // double test makes it easier to set a breakpoint...
                                if (!is_ex_exactly_of_type((*it_last).rest,numeric)||
                                        !is_ex_exactly_of_type((*it).rest,numeric)) {
-                                       printpair(cout,*it_last,0);
-                                       cout << ">";
-                                       printpair(cout,*it,0);
-                                       cout << "\n";
-                                       cout << "pair1:" << std::endl;
-                                       (*it_last).rest.printtree(cout);
-                                       (*it_last).coeff.printtree(cout);
-                                       cout << "pair2:" << std::endl;
-                                       (*it).rest.printtree(cout);
-                                       (*it).coeff.printtree(cout);
+                                       printpair(std::clog,*it_last,0);
+                                       std::clog << ">";
+                                       printpair(std::clog,*it,0);
+                                       std::clog << "\n";
+                                       std::clog << "pair1:" << std::endl;
+                                       (*it_last).rest.printtree(std::clog);
+                                       (*it_last).coeff.printtree(std::clog);
+                                       std::clog << "pair2:" << std::endl;
+                                       (*it).rest.printtree(std::clog);
+                                       (*it).coeff.printtree(std::clog);
                                        return 0;
                                }
                        }
@@ -1734,7 +1734,7 @@ unsigned expairseq::hashtabfactor=1;
 //////////
 
 const expairseq some_expairseq;
-const type_info & typeid_expairseq=typeid(some_expairseq);
+const std::type_info & typeid_expairseq = typeid(some_expairseq);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index ee7ddbd3fcc358d5f03e7b0167a9275fb2eb7604..a1edba119956909d97ddbdee4be0f0038e539523 100644 (file)
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -197,7 +197,7 @@ protected:
 // global constants
 
 extern const expairseq some_expairseq;
-extern const type_info & typeid_expairseq;
+extern const std::type_info & typeid_expairseq;
 
 // utility functions
 inline const expairseq &ex_to_expairseq(const ex &e)

diff --git a/ginac/fail.cpp b/ginac/fail.cpp
index 2cea9eb1a49e9f32b5b027cd9d4b4995be3b3fe3..7205f1298f6ca685b5398652a1f5526a485d1998 100644 (file)
--- a/ginac/fail.cpp
+++ b/ginac/fail.cpp
@@ -160,7 +160,7 @@ int fail::compare_same_type(const basic & other) const
 //////////
 
 const fail some_fail;
-const type_info & typeid_fail=typeid(some_fail);
+const std::type_info & typeid_fail = typeid(some_fail);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/fail.h b/ginac/fail.h
index c7a80a7e22cf54ac4aef3fdc31aca6cdf2d66811..ab313b2c65f232e1445e1b6f17c585f08d2c3253 100644 (file)
--- a/ginac/fail.h
+++ b/ginac/fail.h
@@ -69,7 +69,7 @@ protected:
 // global constants
 
 extern const fail some_fail;
-extern const type_info & typeid_fail;
+extern const std::type_info & typeid_fail;
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/function.pl b/ginac/function.pl
index c6e00834bc76c96a01f1e9d8730e56c31d14eea8..b583a76b639c896a0e65624b2e5b08c34013687d 100755 (executable)
--- a/ginac/function.pl
+++ b/ginac/function.pl
@@ -467,7 +467,7 @@ inline const function &ex_to_function(const ex &e)
 // global constants
 
 extern const function some_function;
-extern const type_info & typeid_function;
+extern const std::type_info & typeid_function;
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
@@ -1081,7 +1081,7 @@ unsigned function::find_function(const std::string &name, unsigned nparams)
 //////////
 
 const function some_function;
-const type_info & typeid_function=typeid(some_function);
+const std::type_info & typeid_function=typeid(some_function);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/idx.cpp b/ginac/idx.cpp
index 08b982c32146a7e9262a7b9963a86a536f739bc5..da410a21f089c410bae9ba184e4c2b2127731daa 100644 (file)
--- a/ginac/idx.cpp
+++ b/ginac/idx.cpp
@@ -373,7 +373,7 @@ unsigned idx::next_serial=0;
 //////////
 
 const idx some_idx;
-const type_info & typeid_idx=typeid(some_idx);
+const std::type_info & typeid_idx = typeid(some_idx);
 
 //////////
 // other functions

diff --git a/ginac/idx.h b/ginac/idx.h
index 3ab440e9710e4405e9dc32fc2cd6dca265d680a4..ea19e752eabb3f10072114d2e6ef7561fe5b90db 100644 (file)
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -94,7 +94,7 @@ protected:
 // global constants
 
 extern const idx some_idx;
-extern const type_info & typeid_idx;
+extern const std::type_info & typeid_idx;
 
 // utility functions
 inline const idx &ex_to_idx(const ex &e)

diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp
index 8151b080a4b2f685a96e2769495e393a1773d7a4..ac5eb57665deb21255e5e23a2c1dc7f28bb26d9b 100644 (file)
--- a/ginac/indexed.cpp
+++ b/ginac/indexed.cpp
@@ -332,7 +332,7 @@ bool indexed::all_of_type_idx(void) const
 //////////
 
 const indexed some_indexed;
-const type_info & typeid_indexed=typeid(some_indexed);
+const std::type_info & typeid_indexed = typeid(some_indexed);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 03dfa77af5593ed0d03b605f47641233938be473..44021b8e23302050e14ebedd72892c37068c5eff 100644 (file)
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -91,7 +91,7 @@ protected:
 // global constants
 
 extern const indexed some_indexed;
-extern const type_info & typeid_indexed;
+extern const std::type_info & typeid_indexed;
 
 // utility functions
 inline const indexed &ex_to_indexed(const ex &e)

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 6541af420574cc4cf8b1dd30c87b5c2878911121..9ce90672050007a2f76729a7a1561c97557af339 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -489,7 +489,7 @@ ex lsolve(const ex &eqns, const ex &symbols)
        matrix solution;
        try {
                solution = sys.solve(vars,rhs);
-       } catch (const runtime_error & e) {
+       } catch (const std::runtime_error & e) {
                // Probably singular matrix or otherwise overdetermined system:
                // It is consistent to return an empty list
                return lst();

diff --git a/ginac/inifcns_gamma.cpp b/ginac/inifcns_gamma.cpp
index ae12074e9a0ac6fc7ccecf18570d4a586498ceec..3ba8bb462dbf8909c477e773fd4cbf7b469dd7ac 100644 (file)
--- a/ginac/inifcns_gamma.cpp
+++ b/ginac/inifcns_gamma.cpp
@@ -105,7 +105,6 @@ static ex lgamma_series(const ex & arg,
        ex recur;
        for (numeric p; p<=m; ++p)
                recur += log(arg+p);
-       cout << recur << endl;
        return (lgamma(arg+m+_ex1())-recur).series(rel, order, options);
 }
 

diff --git a/ginac/input_lexer.h b/ginac/input_lexer.h
index 4bb38f9e35dba0e6fd43032946b6ce439f3a405e..db3e622663f328ef6aa9230f105ae3c8fe9766a4 100644 (file)
--- a/ginac/input_lexer.h
+++ b/ginac/input_lexer.h
@@ -50,7 +50,7 @@ namespace GiNaC {
 class ex;
 
 /** Set the input string to be parsed by ginac_yyparse() (used internally). */
-extern void set_lexer_string(const string &s);
+extern void set_lexer_string(const std::string &s);
 
 /** Set the list of predefined symbols for the lexer (used internally). */
 extern void set_lexer_symbols(ex l);

diff --git a/ginac/input_parser.yy b/ginac/input_parser.yy
index 0bec16c75cc493c2fb4e4c32818df237c803ec48..3fa82c1235fa945158b778e607a4a7a64ef508a5 100644 (file)
--- a/ginac/input_parser.yy
+++ b/ginac/input_parser.yy
@@ -49,7 +49,7 @@ namespace GiNaC {
 ex parsed_ex;
 
 // Last error message returned by parser
-static string parser_error;
+static std::string parser_error;
 %}
 
 /* Tokens (T_LITERAL means a literal value returned by the parser, but not
@@ -78,8 +78,8 @@ input : exp {
                try {
                        parsed_ex = $1;
                        YYACCEPT;
-               } catch (exception &e) {
-                       parser_error = e.what();
+               } catch (std::exception &err) {
+                       parser_error = err.what();
                        YYERROR;
                }
        }
@@ -146,7 +146,7 @@ row : exp                   {$$ = lst($1);}
 
 %%
 // Get last error encountered by parser
-string get_parser_error(void)
+std::string get_parser_error(void)
 {
        return parser_error;
 }
@@ -160,5 +160,5 @@ using GiNaC::parser_error;
 // Error print routine (store error string in parser_error)
 int ginac_yyerror(char *s)
 {
-       parser_error = string(s) + " at " + string(ginac_yytext);
+       parser_error = std::string(s) + " at " + std::string(ginac_yytext);
 }

diff --git a/ginac/isospin.cpp b/ginac/isospin.cpp
index b46ecb0e72142764a76b05f0ab6bdc48eaecc68f..0eefc1210e0faf21213ddc8ec55bd4626a6f241a 100644 (file)
--- a/ginac/isospin.cpp
+++ b/ginac/isospin.cpp
@@ -249,7 +249,7 @@ unsigned isospin::next_serial=0;
 //////////
 
 const isospin some_isospin;
-const type_info & typeid_isospin=typeid(some_isospin);
+const std::type_info & typeid_isospin = typeid(some_isospin);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/isospin.h b/ginac/isospin.h
index da77efa4a64041cbe2847d0d28369870cd891fa4..b5edbb0dc878d5fb91d5e17a224d16e422f1fff1 100644 (file)
--- a/ginac/isospin.h
+++ b/ginac/isospin.h
@@ -85,7 +85,7 @@ private:
 // global constants
 
 extern const isospin some_isospin;
-extern const type_info & typeid_isospin;
+extern const std::type_info & typeid_isospin;
 
 // utility functions
 inline const isospin &ex_to_isospin(const ex &e)

diff --git a/ginac/lorentzidx.cpp b/ginac/lorentzidx.cpp
index 91fc6d9e183e9d15d41f9c0a679bb4d5d2f771e7..584a5d0e2d169ae9004137e4e1b7d3efac5b3d75 100644 (file)
--- a/ginac/lorentzidx.cpp
+++ b/ginac/lorentzidx.cpp
@@ -293,7 +293,7 @@ lorentzidx lorentzidx::create_anonymous_representative(void) const
 //////////
 
 const lorentzidx some_lorentzidx;
-const type_info & typeid_lorentzidx=typeid(some_lorentzidx);
+const std::type_info & typeid_lorentzidx = typeid(some_lorentzidx);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/lorentzidx.h b/ginac/lorentzidx.h
index f7aa397b5a7fa6bf118a4d31300123fad11ef0e3..25cab856db18580012ae45696f51d796efe30cc7 100644 (file)
--- a/ginac/lorentzidx.h
+++ b/ginac/lorentzidx.h
@@ -85,7 +85,7 @@ protected:
 // global constants
 
 extern const lorentzidx some_lorentzidx;
-extern const type_info & typeid_lorentzidx;
+extern const std::type_info & typeid_lorentzidx;
 
 // utility functions
 inline const lorentzidx &ex_to_lorentzidx(const ex &e)

diff --git a/ginac/lortensor.cpp b/ginac/lortensor.cpp
index 2b797efbfa04827fdcfb6bbe3d2c73ec9b1a30c1..feccd2260d0ad0976079d9e3391bcf6a33b2302f 100644 (file)
--- a/ginac/lortensor.cpp
+++ b/ginac/lortensor.cpp
@@ -493,7 +493,7 @@ ex Dim(void)
 //////////
 
 const lortensor some_lortensor;
-const type_info & typeid_lortensor=typeid(some_lortensor);
+const std::type_info & typeid_lortensor = typeid(some_lortensor);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/lortensor.h b/ginac/lortensor.h
index 8d85df81ca641600f64eadaeb68b429bbce343d5..a5fdb5d1b488fe6bfcd048cbb9defece6d65bcc6 100644 (file)
--- a/ginac/lortensor.h
+++ b/ginac/lortensor.h
@@ -123,7 +123,7 @@ private:
 // global constants
 
 extern const lortensor some_lortensor;
-extern const type_info & typeid_lortensor;
+extern const std::type_info & typeid_lortensor;
 
 // utility functions
        

diff --git a/ginac/matrix.cpp b/ginac/matrix.cpp
index 8b747e8562332c724d7f211803a7aadb00267acd..3e0eeaf84ded4d106b4070856c2ca91020046400 100644 (file)
--- a/ginac/matrix.cpp
+++ b/ginac/matrix.cpp
@@ -1219,7 +1219,7 @@ ex lst_to_matrix(const ex &l)
 //////////
 
 const matrix some_matrix;
-const type_info & typeid_matrix=typeid(some_matrix);
+const std::type_info & typeid_matrix = typeid(some_matrix);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 37dffa42d74c64e1c816ead91ee18b4389d7f384..e3916e2a66899ff44fd5bfa9905af5f91322185a 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -111,7 +111,7 @@ protected:
 
 // global constants
 extern const matrix some_matrix;
-extern const type_info & typeid_matrix;
+extern const std::type_info & typeid_matrix;
 
 
 // wrapper functions around member functions
@@ -119,16 +119,16 @@ extern const type_info & typeid_matrix;
 inline unsigned nops(const matrix & m)
 { return m.nops(); }
 
-inline ex expand(const matrix & m, unsigned options=0)
+inline ex expand(const matrix & m, unsigned options = 0)
 { return m.expand(options); }
 
 inline bool has(const matrix & m, const ex & other)
 { return m.has(other); }
 
-inline ex eval(const matrix & m, int level=0)
+inline ex eval(const matrix & m, int level = 0)
 { return m.eval(level); }
 
-inline ex evalf(const matrix & m, int level=0)
+inline ex evalf(const matrix & m, int level = 0)
 { return m.evalf(level); }
 
 inline unsigned rows(const matrix & m)

diff --git a/ginac/mul.cpp b/ginac/mul.cpp
index 3e257e6288e4153e2e0f028c23ac333bbd641e21..ee00dd4e91a0fc7ac861738f44b9e790fc8dbe2e 100644 (file)
--- a/ginac/mul.cpp
+++ b/ginac/mul.cpp
@@ -784,7 +784,7 @@ unsigned mul::precedence = 50;
 //////////
 
 const mul some_mul;
-const type_info & typeid_mul = typeid(some_mul);
+const std::type_info & typeid_mul = typeid(some_mul);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/mul.h b/ginac/mul.h
index 8358b57df6ab55cd6c074e026b05ea3458f47891..93ac7b0d51567f97f392cfda8770a2d2647ce2c9 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -115,7 +115,7 @@ protected:
 // global constants
 
 extern const mul some_mul;
-extern const type_info & typeid_mul;
+extern const std::type_info & typeid_mul;
 
 // utility functions
 inline const mul &ex_to_mul(const ex &e)

diff --git a/ginac/ncmul.cpp b/ginac/ncmul.cpp
index d8e7584bc723e248702a2336255d88a7393ecc5c..cf4f62463218ecb13710ec9070af4f25c9967169 100644 (file)
--- a/ginac/ncmul.cpp
+++ b/ginac/ncmul.cpp
@@ -632,7 +632,7 @@ unsigned ncmul::precedence=50;
 //////////
 
 const ncmul some_ncmul;
-const type_info & typeid_ncmul=typeid(some_ncmul);
+const std::type_info & typeid_ncmul = typeid(some_ncmul);
 
 //////////
 // friend functions

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index ed1b299797a8299876479cc6176a2e21d3e3f9af..fac40b6fabecf335fb79b920346960b8c2b266a2 100644 (file)
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -105,7 +105,7 @@ protected:
 // global constants
 
 extern const ncmul some_ncmul;
-extern const type_info & typeid_ncmul;
+extern const std::type_info & typeid_ncmul;
 
 // friend funtions 
 

diff --git a/ginac/normal.cpp b/ginac/normal.cpp
index 0e1a0bfa4f39b2e8f5911cb4813e969c5e3ac52d..1cbb87737cf305b96ef50590a704690dd954b1bb 100644 (file)
--- a/ginac/normal.cpp
+++ b/ginac/normal.cpp
@@ -196,7 +196,7 @@ static void get_symbol_stats(const ex &a, const ex &b, sym_desc_vec &v)
                int deg_b = b.degree(*(it->sym));
                it->deg_a = deg_a;
                it->deg_b = deg_b;
-               it->max_deg = max(deg_a, deg_b);
+               it->max_deg = std::max(deg_a,deg_b);
                it->ldeg_a = a.ldegree(*(it->sym));
                it->ldeg_b = b.ldegree(*(it->sym));
                it++;
@@ -1353,10 +1353,11 @@ static ex heur_gcd(const ex &a, const ex &b, ex *ca, ex *cb, sym_desc_vec::const
        numeric rgc = gc.inverse();
        ex p = a * rgc;
        ex q = b * rgc;
-       int maxdeg = max(p.degree(x), q.degree(x));
-
+       int maxdeg =  std::max(p.degree(x),q.degree(x));
+       
        // Find evaluation point
-       numeric mp = p.max_coefficient(), mq = q.max_coefficient();
+       numeric mp = p.max_coefficient();
+       numeric mq = q.max_coefficient();
        numeric xi;
        if (mp > mq)
                xi = mq * _num2() + _num2();
@@ -1595,7 +1596,7 @@ factored_b:
        // Cancel trivial common factor
        int ldeg_a = var->ldeg_a;
        int ldeg_b = var->ldeg_b;
-       int min_ldeg = min(ldeg_a, ldeg_b);
+       int min_ldeg = std::min(ldeg_a,ldeg_b);
        if (min_ldeg > 0) {
                ex common = power(x, min_ldeg);
 //std::clog << "trivial common factor " << common << endl;

diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp
index 228540d78260125bc813293998a72330256929a1..258a4b1c483029d585660aa2465d07c1f9260f78 100644 (file)
--- a/ginac/numeric.cpp
+++ b/ginac/numeric.cpp
@@ -1212,7 +1212,7 @@ unsigned numeric::precedence = 30;
 //////////
 
 const numeric some_numeric;
-const type_info & typeid_numeric=typeid(some_numeric);
+const std::type_info & typeid_numeric = typeid(some_numeric);
 /** Imaginary unit.  This is not a constant but a numeric since we are
  *  natively handing complex numbers anyways. */
 const numeric I = numeric(::complex(cl_I(0),cl_I(1)));

diff --git a/ginac/numeric.h b/ginac/numeric.h
index 25cf91e6adff7023cd1db314ed5232cc908687d4..ff1c27d86eb39b003fb2c21fbf62b69becd523b6 100644 (file)
--- a/ginac/numeric.h
+++ b/ginac/numeric.h
@@ -207,7 +207,7 @@ protected:
 
 extern const numeric some_numeric;
 extern const numeric I;
-extern const type_info & typeid_numeric;
+extern const std::type_info & typeid_numeric;
 extern _numeric_digits Digits;
 
 //#define is_a_numeric_hash(x) ((x)==HASHVALUE_NUMERIC)

diff --git a/ginac/power.cpp b/ginac/power.cpp
index 0bef15c42ac46ceab7d291444c5b9917723aecb0..53342a9e57eef4bd751a614bda3f3d61b543524a 100644 (file)
--- a/ginac/power.cpp
+++ b/ginac/power.cpp
@@ -845,7 +845,7 @@ unsigned power::precedence = 60;
 //////////
 
 const power some_power;
-const type_info & typeid_power=typeid(some_power);
+const std::type_info & typeid_power=typeid(some_power);
 
 // helper function
 

diff --git a/ginac/power.h b/ginac/power.h
index 08c8a75a5b1ab9f7a1f5ad6c018f1f794a963476..4d93741f0805f1415156f50e43de5f52407b53af 100644 (file)
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -108,7 +108,7 @@ protected:
 // global constants
 
 extern const power some_power;
-extern const type_info & typeid_power;
+extern const std::type_info & typeid_power;
 
 // utility functions
 inline const power &ex_to_power(const ex &e)

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index 94bdb55899b3e5ac75269e7ad3493d20d51e5585..9dc0921ed3317a299ee15533b11789a16d6ad130 100644 (file)
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -894,7 +894,7 @@ ex ex::series(const ex & r, int order, unsigned options) const
 
 // Global constants
 const pseries some_pseries;
-const type_info & typeid_pseries = typeid(some_pseries);
+const std::type_info & typeid_pseries = typeid(some_pseries);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/pseries.h b/ginac/pseries.h
index eb0ef77d5f1cf8ab1e0534e354afba4023a3f753..cdae3caa8b5566225d823dff12c580c0c47d7cf6 100644 (file)
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -99,7 +99,7 @@ protected:
 
 // global constants
 extern const pseries some_pseries;
-extern const type_info & typeid_pseries;
+extern const std::type_info & typeid_pseries;
 
 /** Return a reference to the pseries object embedded in an expression.
  *  The result is undefined if the expression does not contain a pseries

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index a03b60f8ec812eca99e56f5aa5419cd5a0ef1ff5..f34825f42b01e1cd83739d2ab291571aeca81237 100644 (file)
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -401,7 +401,7 @@ unsigned relational::precedence=20;
 //////////
 
 const relational some_relational;
-const type_info & typeid_relational=typeid(some_relational);
+const std::type_info & typeid_relational = typeid(some_relational);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/relational.h b/ginac/relational.h
index c9c0eb68700e2029eea28c87bcb4f0eacd1e44ba..c1077f1506e71f67eea9292e5ce030e3a3a27638 100644 (file)
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -102,7 +102,7 @@ protected:
 // global constants
 
 extern const relational some_relational;
-extern const type_info & typeid_relational;
+extern const std::type_info & typeid_relational;
 
 // utility functions
 inline const relational &ex_to_relational(const ex &e)

diff --git a/ginac/simp_lor.cpp b/ginac/simp_lor.cpp
index e589b18fd351e65f8376692c808df4a29ec5c37f..6e5fbdabda189a9a340865ddd36f8a064c832ee0 100644 (file)
--- a/ginac/simp_lor.cpp
+++ b/ginac/simp_lor.cpp
@@ -314,7 +314,7 @@ bool simp_lor::all_of_type_lorentzidx(void) const
 //////////
 
 const simp_lor some_simp_lor;
-const type_info & typeid_simp_lor = typeid(some_simp_lor);
+const std::type_info & typeid_simp_lor = typeid(some_simp_lor);
 
 //////////
 // friend functions
@@ -500,8 +500,8 @@ void scalar_products::debugprint(void) const
                const spmapkey & k=(*cit).first;
                std::cerr << "item key=((" << k.first.first
                          << "," << k.first.second << "),";
-               k.second.printraw(cerr);
-               cerr << ") value=" << (*cit).second << std::endl;
+               k.second.printraw(std::cerr);
+               std::cerr << ") value=" << (*cit).second << std::endl;
        }
 }
 

diff --git a/ginac/simp_lor.h b/ginac/simp_lor.h
index 4f5c49f555d84b458a1dcae2c383cb02d0de6ca0..1d68eee794719b747239d801674d1d7270da6808 100644 (file)
--- a/ginac/simp_lor.h
+++ b/ginac/simp_lor.h
@@ -62,7 +62,7 @@ public:
        }
 };
 
-typedef map<spmapkey,ex,spmapkey_is_less> spmap;
+typedef std::map<spmapkey,ex,spmapkey_is_less> spmap;
 
 class simp_lor;
 
@@ -154,7 +154,7 @@ protected:
 // global constants
 
 extern const simp_lor some_simp_lor;
-extern const type_info & typeid_simp_lor;
+extern const std::type_info & typeid_simp_lor;
 
 // utility functions
 inline const simp_lor &ex_to_simp_lor(const ex &e)

diff --git a/ginac/structure.cpp b/ginac/structure.cpp
index fe3c1c5197aa3c502ed1e02de82e17405ae34e5b..06d07fb7c140d5883badd3fbe974d00c0fadd969 100644 (file)
--- a/ginac/structure.cpp
+++ b/ginac/structure.cpp
@@ -176,7 +176,7 @@ unsigned structure::register_new(const char * nm)
 //////////
 
 const structure some_structure;
-const type_info & typeid_structure=typeid(some_structure);
+const std::type_info & typeid_structure = typeid(some_structure);
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/structure.h b/ginac/structure.h
index 972e1123d95937615e56047a2b04b93786315dc6..43828191997626ba69aa8f13cdcf03ac6876a335 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -84,7 +84,7 @@ public:
 // global constants
 
 extern const structure some_structure;
-extern const type_info & typeid_structure;
+extern const std::type_info & typeid_structure;
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 15f1f0029ca8998b475da393ec5d2f40bb52a701..96216625a1004bf50a2622632ba0326facb6de00 100644 (file)
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -357,7 +357,7 @@ unsigned symbol::next_serial=0;
 //////////
 
 const symbol some_symbol;
-const type_info & typeid_symbol=typeid(some_symbol);
+const std::type_info & typeid_symbol = typeid(some_symbol);
 
 //////////
 // subclass assigned_ex_info

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 3c8c855747c706f6fd96df2cfe905dffa51c5c30..a3fc915fe6c9fcb5d26b9c8030921f97d3d56a53 100644 (file)
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -115,7 +115,7 @@ private:
 // global constants
 
 extern const symbol some_symbol;
-extern const type_info & typeid_symbol;
+extern const std::type_info & typeid_symbol;
 
 // utility functions
 inline const symbol &ex_to_symbol(const ex &e)