X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=c18fadecc9934f5ad55de6d5bc59ca91549aba17;hb=bb2670b06c0f98ef1a4fcb193826d65363a302dd;hp=a2673e584af35f361ccae0289b2ea7381c6c43fc;hpb=27d6204effdef95a00af461fff98024e290dbaa7;p=ginac.git

diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index a2673e58..c18fadec 100644
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -3,7 +3,7 @@
  *  Implementation of sequences of expression pairs. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <iostream>
 #include <algorithm>
 #include <string>
 #include <stdexcept>
@@ -32,7 +33,6 @@
 #include "wildcard.h"
 #include "print.h"
 #include "archive.h"
-#include "debugmsg.h"
 #include "utils.h"
 
 #if EXPAIRSEQ_USE_HASHTAB
@@ -58,20 +58,18 @@ public:
 };
 
 //////////
-// default ctor, dtor, copy ctor assignment operator and helpers
+// default ctor, dtor, copy ctor, assignment operator and helpers
 //////////
 
 // public
 
 expairseq::expairseq(const expairseq &other)
 {
-	debugmsg("expairseq copy ctor",LOGLEVEL_CONSTRUCT);
 	copy(other);
 }
 
 const expairseq &expairseq::operator=(const expairseq &other)
 {
-	debugmsg("expairseq operator=",LOGLEVEL_ASSIGNMENT);
 	if (this != &other) {
 		destroy(true);
 		copy(other);
@@ -115,14 +113,12 @@ DEFAULT_DESTROY(expairseq)
 
 expairseq::expairseq(const ex &lh, const ex &rh) : inherited(TINFO_expairseq)
 {
-	debugmsg("expairseq ctor from ex,ex",LOGLEVEL_CONSTRUCT);
 	construct_from_2_ex(lh,rh);
 	GINAC_ASSERT(is_canonical());
 }
 
 expairseq::expairseq(const exvector &v) : inherited(TINFO_expairseq)
 {
-	debugmsg("expairseq ctor from exvector",LOGLEVEL_CONSTRUCT);
 	construct_from_exvector(v);
 	GINAC_ASSERT(is_canonical());
 }
@@ -130,7 +126,6 @@ expairseq::expairseq(const exvector &v) : inherited(TINFO_expairseq)
 expairseq::expairseq(const epvector &v, const ex &oc)
   : inherited(TINFO_expairseq), overall_coeff(oc)
 {
-	debugmsg("expairseq ctor from epvector,ex",LOGLEVEL_CONSTRUCT);
 	construct_from_epvector(v);
 	GINAC_ASSERT(is_canonical());
 }
@@ -138,7 +133,6 @@ expairseq::expairseq(const epvector &v, const ex &oc)
 expairseq::expairseq(epvector *vp, const ex &oc)
   : inherited(TINFO_expairseq), overall_coeff(oc)
 {
-	debugmsg("expairseq ctor from epvector *,ex",LOGLEVEL_CONSTRUCT);
 	GINAC_ASSERT(vp!=0);
 	construct_from_epvector(*vp);
 	delete vp;
@@ -154,7 +148,6 @@ expairseq::expairseq(const archive_node &n, const lst &sym_lst) : inherited(n, s
 	, hashtabsize(0)
 #endif
 {
-	debugmsg("expairseq ctor from archive_node", LOGLEVEL_CONSTRUCT);
 	for (unsigned int i=0; true; i++) {
 		ex rest;
 		ex coeff;
@@ -188,14 +181,11 @@ DEFAULT_UNARCHIVE(expairseq)
 
 basic *expairseq::duplicate() const
 {
-	debugmsg("expairseq duplicate",LOGLEVEL_DUPLICATE);
 	return new expairseq(*this);
 }
 
 void expairseq::print(const print_context &c, unsigned level) const
 {
-	debugmsg("expairseq print",LOGLEVEL_PRINT);
-
 	if (is_of_type(c, print_tree)) {
 
 		unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
@@ -1067,7 +1057,7 @@ void expairseq::make_flat(const epvector &v)
 /** Brings this expairseq into a sorted (canonical) form. */
 void expairseq::canonicalize(void)
 {
-	sort(seq.begin(), seq.end(), expair_is_less());
+	std::sort(seq.begin(), seq.end(), expair_is_less());
 }
 
 
@@ -1476,7 +1466,7 @@ bool expairseq::is_canonical() const
  *  if no members were changed. */
 epvector * expairseq::expandchildren(unsigned options) const
 {
-	epvector::const_iterator last = seq.end();
+	const epvector::const_iterator last = seq.end();
 	epvector::const_iterator cit = seq.begin();
 	while (cit!=last) {
 		const ex &expanded_ex = cit->rest.expand(options);