X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fremember.h;h=d036e8d6f6bd00bd794828178b82547c3fda6ad6;hp=a068f5a91a6c2a10a61584ce92addf77200ba4c5;hb=9cd8ed658fbc4b8c50b40e1db770462526dfb806;hpb=383d5eb3b0f0506810d9105a268f939125bfc347

diff --git a/ginac/remember.h b/ginac/remember.h
index a068f5a9..d036e8d6 100644
--- a/ginac/remember.h
+++ b/ginac/remember.h
@@ -4,7 +4,7 @@
  *  in GiNaC functions */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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,18 +18,17 @@
  *
  *  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_REMEMBER_H__
-#define __GINAC_REMEMBER_H__
+#ifndef GINAC_REMEMBER_H
+#define GINAC_REMEMBER_H
 
-#include <vector>
+#include <iosfwd>
 #include <list>
+#include <vector>
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 class function;
 class ex;
@@ -42,9 +41,9 @@ class remember_table_entry {
 public:
 	remember_table_entry(function const & f, ex const & r);
 	bool is_equal(function const & f) const;
-	ex get_result(void) const { return result; }
-	unsigned long get_last_access(void) const { return last_access; }
-	unsigned long get_successful_hits(void) const { return successful_hits; };
+	ex get_result() const { return result; }
+	unsigned long get_last_access() const { return last_access; }
+	unsigned long get_successful_hits() const { return successful_hits; };
 
 protected:
 	unsigned hashvalue;
@@ -87,18 +86,16 @@ public:
 	remember_table(unsigned s, unsigned as, unsigned strat);
 	bool lookup_entry(function const & f, ex & result) const;
 	void add_entry(function const & f, ex const & result);
-	void clear_all_entries(void);
+	void clear_all_entries();
 	void show_statistics(std::ostream & os, unsigned level) const;
-	static std::vector<remember_table> & remember_tables(void);
+	static std::vector<remember_table> & remember_tables();
 protected:
-	void init_table(void);
+	void init_table();
 	unsigned table_size;
 	unsigned max_assoc_size;
 	unsigned remember_strategy;
 };      
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
-#endif // ndef __GINAC_REMEMBER_H__
+#endif // ndef GINAC_REMEMBER_H