- Lewis-Wester tests D and E now benchmark the time to expand the

[ginac.git] / ginac / archive.cpp

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index dcfb00dc9c37e382cb0ae88550cec11adaf4fd93..61d60c271e2475306218dbdc0de18a0b8e0c3e3d 100644 (file)
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -3,7 +3,7 @@
  *  Archiving of GiNaC expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -188,7 +188,9 @@ static unsigned int read_unsigned(std::istream &is)
        unsigned int ret = 0;
        unsigned int shift = 0;
        do {
-               is.get(b);
+        char b2;
+               is.get(b2);
+        b = b2;
                ret |= (b & 0x7f) << shift;
                shift += 7;
        } while (b & 0x80);
@@ -222,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();
@@ -524,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";
@@ -536,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";
@@ -575,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++;
        }
 }