X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Futils.h;h=393c474f025f618785bcb3371f0f54a974571d38;hp=c5d7e03d40bee0c9213c02524e0915f11cc0aa78;hb=526825bcee294cb20e37d8db6d5040ba0f8c428f;hpb=def26469ff96228c66e877bb5594e7d9a24b638f diff --git a/ginac/utils.h b/ginac/utils.h index c5d7e03d..393c474f 100644 --- a/ginac/utils.h +++ b/ginac/utils.h @@ -4,7 +4,7 @@ * of any interest to the user of the library. */ /* - * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2009 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 @@ -21,20 +21,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GINAC_UTILS_H__ -#define __GINAC_UTILS_H__ +#ifndef GINAC_UTILS_H +#define GINAC_UTILS_H +#include "assertion.h" #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include #include #ifdef HAVE_STDINT_H #include // for uintptr_t #endif - -#include "assertion.h" +#include namespace GiNaC { @@ -407,20 +406,6 @@ extern const ex _ex120; #define DEFAULT_CTOR(classname) \ classname::classname() { setflag(status_flags::evaluated | status_flags::expanded); } -#define DEFAULT_UNARCHIVE(classname) \ -ex classname::unarchive(const archive_node &n, lst &sym_lst) \ -{ \ - return (new classname(n, sym_lst))->setflag(status_flags::dynallocated); \ -} - -#define DEFAULT_ARCHIVING(classname) \ -classname::classname(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {} \ -DEFAULT_UNARCHIVE(classname) \ -void classname::archive(archive_node &n) const \ -{ \ - inherited::archive(n); \ -} - #define DEFAULT_COMPARE(classname) \ int classname::compare_same_type(const basic & other) const \ { \ @@ -443,5 +428,4 @@ void classname::do_print_latex(const print_latex & c, unsigned level) const \ } // namespace GiNaC - -#endif // ndef __GINAC_UTILS_H__ +#endif // ndef GINAC_UTILS_H