X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fhash_map.h;h=6d334d7d8dafeebbc18792a5f0469dfda368cf00;hp=df5a674b5f51dc62c9e702fdd744dbef8951a575;hb=75eb4d8abee66a844c9d1b23f1e001c860e8de7d;hpb=9cd789be913f4fcd4b615cefa3d46662b3c63a46

diff --git a/ginac/hash_map.h b/ginac/hash_map.h
index df5a674b..6d334d7d 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-2016 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 {
 
 /*
@@ -193,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
@@ -337,7 +336,7 @@ public:
 
 	iterator insert(iterator pos, const value_type &x)
 	{
-		return insert(val).first;
+		return insert(x).first;
 	}
 
 	template <class InputIterator>
@@ -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<T, A> &lhs, GiNaC::exhashmap<T, A> &rhs)
 
 } // namespace std
 
-#endif // ndef __GINAC_HASH_MAP_H__
+#endif // ndef GINAC_HASH_MAP_H