Remove 'level' argument of normal().

[ginac.git] / ginac / fail.h

diff --git a/ginac/fail.h b/ginac/fail.h
index 240509239851bdd68e4ec0810d9978fa07820a5f..8b3c1cb228508c1e1484484296c44c90714c2b20 100644 (file)
--- a/ginac/fail.h
+++ b/ginac/fail.h
@@ -1,10 +1,10 @@
 /** @file fail.h
  *
  *  Interface to class signaling failure of operation. Considered obsolete
- *  (all of this is replaced by exceptions). */
+ *  somewhat obsolete (most of this can be replaced by exceptions). */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 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
@@ -18,13 +18,14 @@
  *
  *  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_FAIL_H__
-#define __GINAC_FAIL_H__
+#ifndef GINAC_FAIL_H
+#define GINAC_FAIL_H
 
 #include "basic.h"
+#include "archive.h"
 
 namespace GiNaC {
 
@@ -32,19 +33,16 @@ class fail : public basic
 {
        GINAC_DECLARE_REGISTERED_CLASS(fail, basic)
        
-       // functions overriding virtual functions from bases classes
-public:
-       void print(const print_context & c, unsigned level = 0) const;
+       // functions overriding virtual functions from base classes
 protected:
-       unsigned return_type(void) const { return return_types::noncommutative_composite; };
-};
+       unsigned return_type() const override { return return_types::noncommutative_composite; };
 
-/** Specialization of is_exactly_a<fail>(obj) for fail objects. */
-template<> inline bool is_exactly_a<fail>(const basic & obj)
-{
-       return obj.tinfo()==TINFO_fail;
-}
+       // non-virtual functions in this class
+protected:
+       void do_print(const print_context & c, unsigned level) const;
+};
+GINAC_DECLARE_UNARCHIVER(fail);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_FAIL_H__
+#endif // ndef GINAC_FAIL_H