X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fhash_map.h;h=68dc3df5d708d2937bf40f30b53c56e6108024ab;hb=7905061f6487b278e08b103d4d142decb418535e;hp=839b8238f8402c78ded1c0c4dea3bce19e278d0a;hpb=5e1d38fb7294baa1922341021698a2106238b571;p=ginac.git

diff --git a/ginac/hash_map.h b/ginac/hash_map.h
index 839b8238..68dc3df5 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-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2018 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 <list>
-#include <iterator>
 #include <algorithm>
 #include <functional>
+#include <iterator>
+#include <list>
 #include <utility>
 
-
 namespace GiNaC {
 
 /*
@@ -73,7 +72,6 @@ class exhashmap;
  *
  *  Differences to map<>:
  *   - no lower_bound()/upper_bound()
- *   - no "insert with a hint" insert(iterator, key_type)
  *   - no reverse iterators, no rbegin()/rend()
  *   - no operator<()
  *   - comparison functor is hardcoded to ex_is_less
@@ -194,7 +192,7 @@ public:
 	typedef typename Table::size_type size_type;
 	typedef typename Table::difference_type difference_type;
 
-	class value_compare : public std::binary_function<value_type, value_type, bool>, private key_compare {
+	class value_compare : private key_compare {
 		friend class exhashmap;
 	public:
 		bool operator()(const value_type &lhs, const value_type &rhs) const
@@ -254,13 +252,6 @@ protected:
 		return num_buckets - (num_buckets >> 2);
 	}
 
-	/** Empty all buckets in the table. */
-	void empty_all_buckets()
-	{
-		for (table_iterator i = hashtab.begin(); i != hashtab.end(); ++i)
-			i->first = EMPTY;
-	}
-
 	void grow();
 
 public:
@@ -343,6 +334,11 @@ public:
 	// Modifiers
 	std::pair<iterator, bool> insert(const value_type &x);
 
+	iterator insert(iterator pos, const value_type &x)
+	{
+		return insert(x).first;
+	}
+
 	template <class InputIterator>
 	void insert(InputIterator first, InputIterator last)
 	{
@@ -434,6 +430,7 @@ public:
 		return !(lhs == rhs);
 	}
 
+#if 0
 	void dump() const
 	{
 		std::clog << "num_entries = " << num_entries << std::endl;
@@ -444,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). */
@@ -595,4 +593,4 @@ inline void swap(GiNaC::exhashmap<T, A> &lhs, GiNaC::exhashmap<T, A> &rhs)
 
 } // namespace std
 
-#endif // ndef __GINAC_HASH_MAP_H__
+#endif // ndef GINAC_HASH_MAP_H