X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Frelational.h;h=e087c17ff54c4cb026abaf104629ccdba0a1d142;hb=63f9b0510fecd2b50f75df37c9525bc215dc2578;hp=a6727de194810f287328fd31c1160ff9c7f8f830;hpb=b66548802c56b34d6b212a0196d622937841ca61;p=ginac.git

diff --git a/ginac/relational.h b/ginac/relational.h
index a6727de1..e087c17f 100644
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -3,7 +3,7 @@
  *  Interface to relations between expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 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
@@ -17,14 +17,15 @@
  *
  *  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
  */
 
-#ifndef __GINAC_RELATIONAL_H__
-#define __GINAC_RELATIONAL_H__
+#ifndef GINAC_RELATIONAL_H
+#define GINAC_RELATIONAL_H
 
 #include "basic.h"
 #include "ex.h"
+#include "archive.h"
 
 namespace GiNaC {
 
@@ -59,11 +60,15 @@ public:
 	ex subs(const exmap & m, unsigned options = 0) const;
 	ex eval(int level=0) 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:
 	ex eval_ncmul(const exvector & v) const;
 	bool match_same_type(const basic & other) const;
 	unsigned return_type() const;
-	unsigned return_type_tinfo() const;
+	return_type_t return_type_tinfo() const;
 	unsigned calchash() const;
 
 	// new virtual functions which can be overridden by derived classes
@@ -77,7 +82,7 @@ public:
 
 	// non-virtual functions in this class
 private:
-	// For conversions to boolean, as would be used in an if conditional,
+	// For conversions to Boolean, as would be used in an if conditional,
 	// implicit conversions from bool to int have a large number of
 	// undesirable side effects.  The following safe_bool type enables
 	// use of relational objects in conditionals without those side effects
@@ -100,15 +105,10 @@ protected:
 	ex rh;
 	operators o;
 };
+GINAC_DECLARE_UNARCHIVER(relational); 
 
 // utility functions
 
-/** Specialization of is_exactly_a<relational>(obj) for relational objects. */
-template<> inline bool is_exactly_a<relational>(const basic & obj)
-{
-	return obj.tinfo()==TINFO_relational;
-}
-
 // inlined functions for efficiency
 inline relational::safe_bool relational::operator!() const
 {
@@ -117,4 +117,4 @@ inline relational::safe_bool relational::operator!() const
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_RELATIONAL_H__
+#endif // ndef GINAC_RELATIONAL_H