Happy New Year!

[ginac.git] / ginac / hash_map.h

diff --git a/ginac/hash_map.h b/ginac/hash_map.h
index e7aa924c446a5ab7c5907528e3ca95ae2dbf913d..fb37d862cc752106baa0913e91a8f6fb7da30569 100644 (file)
--- a/ginac/hash_map.h
+++ b/ginac/hash_map.h
@@ -3,7 +3,7 @@
  *  Replacement for map<> using hash tables. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
@@ -20,16 +20,15 @@
  *  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
@@ -594,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