Transition to the (yet to be released) CLN 1.1.

[ginac.git] / ginac / expairseq.cpp

diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index 1f7fcf4184cd76c41206d9be52bc4d12f541c0c9..f79663960cd3aa39e808004dcfb52b20f9e116ce 100644 (file)
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -23,7 +23,6 @@
 #include <algorithm>
 #include <string>
 #include <stdexcept>
-#include <cmath>
 
 #include "expairseq.h"
 #include "lst.h"
@@ -1523,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;
                                }
                        }
@@ -1735,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