X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fremember.cpp;h=3a9227304363386503deb7e742c04f3bd5814528;hp=404c7c81bf0c1823c821521ac3a3f5885648b1e1;hb=5f1c3b3861f1fc7978b5f734e6e058ba95de355c;hpb=57b66d879a72c007eabe081420de11757b5bcf90 diff --git a/ginac/remember.cpp b/ginac/remember.cpp index 404c7c81..3a922730 100644 --- a/ginac/remember.cpp +++ b/ginac/remember.cpp @@ -4,7 +4,7 @@ * in GiNaC functions */ /* - * 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 @@ -27,9 +27,7 @@ #include "utils.h" #include "remember.h" -#ifndef NO_NAMESPACE_GINAC namespace GiNaC { -#endif // ndef NO_NAMESPACE_GINAC ////////// // class remember_table_entry @@ -53,7 +51,7 @@ bool remember_table_entry::is_equal(function const & f) const return true; } -unsigned long remember_table_entry::access_counter=0; +unsigned long remember_table_entry::access_counter = 0; ////////// // class remember_table_list @@ -68,8 +66,8 @@ remember_table_list::remember_table_list(unsigned as, unsigned strat) void remember_table_list::add_entry(function const & f, ex const & result) { - if ((max_assoc_size!=0)&& - (remember_strategy!=remember_strategies::delete_never)&& + if ((max_assoc_size!=0) && + (remember_strategy!=remember_strategies::delete_never) && (size()>=max_assoc_size)) { // table is full, we must delete an older entry GINAC_ASSERT(size()>0); // there must be at least one entry @@ -147,7 +145,7 @@ remember_table::remember_table(unsigned s, unsigned as, unsigned strat) { // we keep max_assoc_size and remember_strategy if we need to clear // all entries - + // use some power of 2 next to s table_size = 1 << log2(s); init_table(); @@ -186,6 +184,4 @@ std::vector & remember_table::remember_tables(void) return *rt; } -#ifndef NO_NAMESPACE_GINAC } // namespace GiNaC -#endif // ndef NO_NAMESPACE_GINAC