* Happy New Year(s)!

[ginac.git] / tools / viewgar.cpp

diff --git a/tools/viewgar.cpp b/tools/viewgar.cpp
index f4ac3529986c3c478db698528a05d43612d485c7..3d51918c50c425563d753f11a5fb499fd2e76488 100644 (file)
--- a/tools/viewgar.cpp
+++ b/tools/viewgar.cpp
@@ -1,8 +1,9 @@
 /** @file viewgar.cpp
  *
- *  GiNaC archive file viewer
- *
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC archive file viewer. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2007 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
@@ -16,27 +17,26 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
+#include <iostream>
 #include <fstream>
 #include <stdexcept>
 
 #include "ginac.h"
 
-#ifndef NO_NAMESPACE_GINAC
+using namespace std;
 using namespace GiNaC;
-#endif // ndef NO_NAMESPACE_GINAC
 
 int main(int argc, char **argv)
 {
        if (argc < 2) {
-               fprintf(stderr, "Usage: %s [-d] file...", argv[0]);
+               cerr << "Usage: " << argv[0] << " [-d] file..." << endl;
                exit(1);
        }
-       argc--; argv++;
+       --argc; ++argv;
 
        bool dump_mode = false;
        try {
@@ -44,24 +44,24 @@ int main(int argc, char **argv)
                while (argc) {
                        if (strcmp(*argv, "-d") == 0) {
                                dump_mode = true;
-                               argc--; argv++;
+                               --argc; ++argv;
                        }
-                       ifstream f(*argv);
+                       std::ifstream f(*argv, std::ios_base::binary);
                        archive ar;
                        f >> ar;
                        if (dump_mode) {
-                               ar.printraw(cout);
-                               cout << endl;
+                               ar.printraw(std::cout);
+                               std::cout << std::endl;
                        } else {
-                               for (unsigned int i=0; i<ar.num_expressions(); i++) {
-                                       string name;
+                               for (unsigned int i=0; i<ar.num_expressions(); ++i) {
+                                       std::string name;
                                        ex e = ar.unarchive_ex(l, name, i);
-                                       cout << name << " = " << e << endl;
+                                       std::cout << name << " = " << e << std::endl;
                                }
                        }
-                       argc--; argv++;
+                       --argc; ++argv;
                }
-       } catch (exception &e) {
-               cerr << *argv << ": " << e.what() << endl;
+       } catch (std::exception &e) {
+               std::cerr << *argv << ": " << e.what() << std::endl;
        }
 }