X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Ffail.cpp;h=4fd01997fda73b5c0b1779e31f8d1e204e0e94ea;hb=073fdd34562e70b0c2edfb221dc02338568bbeb8;hp=d35c2f43e7b81a0ed646545b9842840f2363a4d0;hpb=956eeb82c513a723e864edefa857133282cf692b;p=ginac.git

diff --git a/ginac/fail.cpp b/ginac/fail.cpp
index d35c2f43..4fd01997 100644
--- a/ginac/fail.cpp
+++ b/ginac/fail.cpp
@@ -4,7 +4,7 @@
  *  obsolete all this stuff ought to be replaced by exceptions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -25,64 +25,33 @@
 #include "archive.h"
 #include "debugmsg.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 GINAC_IMPLEMENT_REGISTERED_CLASS(fail, basic)
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor assignment operator and helpers
 //////////
 
 // public
 
 fail::fail() : inherited(TINFO_fail)
 {
-    debugmsg("fail default constructor",LOGLEVEL_CONSTRUCT);
-}
-
-fail::~fail()
-{
-    debugmsg("fail destructor",LOGLEVEL_DESTRUCT);
-    destroy(0);
-}
-
-fail::fail(const fail & other)
-{
-    debugmsg("fail copy constructor",LOGLEVEL_CONSTRUCT);
-    copy(other);
-}
-
-const fail & fail::operator=(const fail & other)
-{
-    debugmsg("fail operator=",LOGLEVEL_ASSIGNMENT);
-    if (this != &other) {
-        destroy(1);
-        copy(other);
-    }
-    return *this;
+	debugmsg("fail default ctor",LOGLEVEL_CONSTRUCT);
 }
 
 // protected
 
 void fail::copy(const fail & other)
 {
-    inherited::copy(other);
+	inherited::copy(other);
 }
 
 void fail::destroy(bool call_parent)
 {
-    if (call_parent) inherited::destroy(call_parent);
+	if (call_parent) inherited::destroy(call_parent);
 }
 
-
-//////////
-// other constructors
-//////////
-
-// none
-
 //////////
 // archiving
 //////////
@@ -90,19 +59,19 @@ void fail::destroy(bool call_parent)
 /** Construct object from archive_node. */
 fail::fail(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-    debugmsg("fail constructor from archive_node", LOGLEVEL_CONSTRUCT);
+	debugmsg("fail ctor from archive_node", LOGLEVEL_CONSTRUCT);
 }
 
 /** Unarchive the object. */
 ex fail::unarchive(const archive_node &n, const lst &sym_lst)
 {
-    return (new fail(n, sym_lst))->setflag(status_flags::dynallocated);
+	return (new fail(n, sym_lst))->setflag(status_flags::dynallocated);
 }
 
 /** Archive the object. */
 void fail::archive(archive_node &n) const
 {
-    inherited::archive(n);
+	inherited::archive(n);
 }
 
 //////////
@@ -111,22 +80,16 @@ void fail::archive(archive_node &n) const
 
 // public
 
-basic * fail::duplicate() const
-{
-    debugmsg("fail duplicate",LOGLEVEL_DUPLICATE);
-    return new fail(*this);
-}
-
-void fail::print(ostream & os, unsigned upper_precedence) const
+void fail::print(std::ostream & os, unsigned upper_precedence) const
 {
-    debugmsg("fail print",LOGLEVEL_PRINT);
-    os << "FAIL";
+	debugmsg("fail print",LOGLEVEL_PRINT);
+	os << "FAIL";
 }
 
-void fail::printraw(ostream & os) const
+void fail::printraw(std::ostream & os) const
 {
-    debugmsg("fail printraw",LOGLEVEL_PRINT);
-    os << "FAIL";
+	debugmsg("fail printraw",LOGLEVEL_PRINT);
+	os << "FAIL";
 }
 
 // protected
@@ -134,34 +97,7 @@ void fail::printraw(ostream & os) const
 int fail::compare_same_type(const basic & other) const
 {
 	// two fails are always identical
-    return 0;
+	return 0;
 }
 
-//////////
-// new virtual functions which can be overridden by derived classes
-//////////
-
-// none
-
-//////////
-// non-virtual functions in this class
-//////////
-
-// none
-
-//////////
-// static member variables
-//////////
-
-// none
-
-//////////
-// global constants
-//////////
-
-const fail some_fail;
-const type_info & typeid_fail=typeid(some_fail);
-
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC