Use C++11 'nullptr' where applicable.

[ginac.git] / ginac / archive.cpp

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index 1d65c7a9ec22f609dfefd62d8a64f919353e0aa5..27ebfb8970a219349df7d54e4f3eebcc5d34aaed 100644 (file)
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -3,7 +3,7 @@
  *  Archiving of GiNaC expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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,15 +20,17 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <iostream>
-#include <stdexcept>
-
 #include "archive.h"
 #include "registrar.h"
 #include "ex.h"
 #include "lst.h"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "tostring.h"
+#endif
+#include "version.h"
+
+#include <iostream>
+#include <stdexcept>
 
 namespace GiNaC {
 
@@ -218,7 +220,7 @@ std::ostream &operator<<(std::ostream &os, const archive &ar)
        os.put('A');
        os.put('R');
        os.put('C');
-       write_unsigned(os, ARCHIVE_VERSION);
+       write_unsigned(os, GINACLIB_ARCHIVE_VERSION);
 
        // Write atoms
        unsigned num_atoms = ar.atoms.size();
@@ -265,9 +267,11 @@ std::istream &operator>>(std::istream &is, archive &ar)
        is.get(c1); is.get(c2); is.get(c3); is.get(c4);
        if (c1 != 'G' || c2 != 'A' || c3 != 'R' || c4 != 'C')
                throw (std::runtime_error("not a GiNaC archive (signature not found)"));
+       constexpr unsigned max_version = GINACLIB_ARCHIVE_VERSION;
+       constexpr unsigned min_version = GINACLIB_ARCHIVE_VERSION - GINACLIB_ARCHIVE_AGE;
        unsigned version = read_unsigned(is);
-       if (version > ARCHIVE_VERSION || version < ARCHIVE_VERSION - ARCHIVE_AGE)
-               throw (std::runtime_error("archive version " + ToString(version) + " cannot be read by this GiNaC library (which supports versions " + ToString(ARCHIVE_VERSION-ARCHIVE_AGE) + " thru " + ToString(ARCHIVE_VERSION)));
+       if ((version > max_version) || (version < min_version))
+               throw (std::runtime_error("archive version " + std::to_string(version) + " cannot be read by this GiNaC library (which supports versions " + std::to_string(min_version) + " thru " + std::to_string(max_version)));
 
        // Read atoms
        unsigned num_atoms = read_unsigned(is);
@@ -315,7 +319,7 @@ archive_atom archive::atomize(const std::string &s) const
 const std::string &archive::unatomize(archive_atom id) const
 {
        if (id >= atoms.size())
-               throw (std::range_error("archive::unatomizee(): atom ID out of range"));
+               throw (std::range_error("archive::unatomize(): atom ID out of range"));
 
        return atoms[id];
 }
@@ -546,7 +550,7 @@ ex archive_node::unarchive(lst &sym_lst) const
 }
 
 int unarchive_table_t::usecount = 0;
-unarchive_map_t* unarchive_table_t::unarch_map = 0;
+unarchive_map_t* unarchive_table_t::unarch_map = nullptr;
 
 unarchive_table_t::unarchive_table_t()
 {
@@ -668,13 +672,5 @@ void archive_node::printraw(std::ostream &os) const
        }
 }
 
-/** Create a dummy archive.  The intention is to fill archive_node's default
- *  ctor, which is currently a Cint-requirement. */
-archive* archive_node::dummy_ar_creator()
-{
-       static archive* some_ar = new archive;
-       return some_ar;
-}
-
 
 } // namespace GiNaC