Replace idx_is_not functor by a C++11 lambda.

[ginac.git] / ginac / numeric.h

diff --git a/ginac/numeric.h b/ginac/numeric.h
index c0f9a8b6b9ace18f344d53377c13a2f749182fa7..aa17d8010d8ac119e7877dc8e066e3c430d469ff 100644 (file)
--- a/ginac/numeric.h
+++ b/ginac/numeric.h
@@ -3,7 +3,7 @@
  *  Makes the interface to the underlying bignum package available. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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,24 +20,17 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_NUMERIC_H__
-#define __GINAC_NUMERIC_H__
+#ifndef GINAC_NUMERIC_H
+#define GINAC_NUMERIC_H
 
 #include "basic.h"
 #include "ex.h"
+#include "archive.h"
 
+#include <cln/complex.h>
 #include <stdexcept>
 #include <vector>
 
-#include <cln/complex.h>
-
-#if defined(G__CINTVERSION) && !defined(__MAKECINT__)
-// Cint @$#$! doesn't like forward declaring classes used for casting operators
-// so we have to include the definition of cln::cl_N here, but it is enough to
-// do so for the compiler, hence the !defined(__MAKECINT__).
-  #include <cln/complex_class.h>
-#endif
-
 namespace GiNaC {
 
 /** Function pointer to implement callbacks in the case 'Digits' gets changed.
@@ -51,7 +44,7 @@ typedef void (* digits_changed_callback)(long);
  *  than a dumber basic type since as a side-effect we let it change
  *  cl_default_float_format when it gets changed.  The only other
  *  meaningful thing to do with it is converting it to an unsigned,
- *  for temprary storing its value e.g.  The user must not create an
+ *  for temporarily storing its value e.g.  The user must not create an
  *  own working object of this class!  Since C++ forces us to make the
  *  class definition visible in order to use an object we put in a
  *  flag which prevents other objects of that class to be created. */
@@ -122,6 +115,10 @@ public:
        ex conjugate() const;
        ex real_part() const;
        ex imag_part() const;
+       /** Save (a.k.a. serialize) object into archive. */
+       void archive(archive_node& n) const;
+       /** Read (a.k.a. deserialize) object from archive. */
+       void read_archive(const archive_node& n, lst& syms);
 protected:
        /** Implementation of ex::diff for a numeric always returns 0.
         *  @see ex::diff */
@@ -184,7 +181,7 @@ public:
        const numeric denom() const;
        int int_length() const;
        // converting routines for interfacing with CLN:
-       numeric(const cln::cl_N &z);
+       explicit numeric(const cln::cl_N &z);
 
 protected:
        void print_numeric(const print_context & c, const char *par_open, const char *par_close, const char *imag_sym, const char *mul_sym, unsigned level) const;
@@ -200,6 +197,7 @@ protected:
 protected:
        cln::cl_N value;
 };
+GINAC_DECLARE_UNARCHIVER(numeric); 
 
 
 // global constants
@@ -329,9 +327,4 @@ ex CatalanEvalf();
 
 } // namespace GiNaC
 
-#ifdef __MAKECINT__
-#pragma link off defined_in cln/number.h;
-#pragma link off defined_in cln/complex_class.h;
-#endif
-
-#endif // ndef __GINAC_NUMERIC_H__
+#endif // ndef GINAC_NUMERIC_H