X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fhash_map.h;h=1c4356dbbe11fdfaf01e4fc07160cbd8b2859d94;hb=20159f92a9ffad034172bd36d532e5ffd24c9ff2;hp=82b18a1b1495dba7afaa974e953735940b4bcc55;hpb=695f6ae955ec530cded8f21efd5569df39447f76;p=ginac.git diff --git a/ginac/hash_map.h b/ginac/hash_map.h index 82b18a1b..1c4356db 100644 --- a/ginac/hash_map.h +++ b/ginac/hash_map.h @@ -3,7 +3,7 @@ * Replacement for map<> using hash tables. */ /* - * GiNaC Copyright (C) 1999-2005 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 @@ -17,19 +17,18 @@ * * 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_HASH_MAP_H__ -#define __GINAC_HASH_MAP_H__ +#ifndef GINAC_HASH_MAP_H +#define GINAC_HASH_MAP_H -#include -#include #include #include +#include +#include #include - namespace GiNaC { /* @@ -431,6 +430,7 @@ public: return !(lhs == rhs); } +#if 0 void dump() const { std::clog << "num_entries = " << num_entries << std::endl; @@ -441,6 +441,7 @@ public: std::clog << (it->first == EMPTY ? "free" : (it->first == USED ? "used" : "erased")) << ", " << it->second.first << " -> " << it->second.second << std::endl; } } +#endif }; /** Return pointer to bucket corresponding to key (or first empty bucket). */ @@ -592,4 +593,4 @@ inline void swap(GiNaC::exhashmap &lhs, GiNaC::exhashmap &rhs) } // namespace std -#endif // ndef __GINAC_HASH_MAP_H__ +#endif // ndef GINAC_HASH_MAP_H