nget/nget-gcc42.patch

   1 Index: nget/auto_map.h
   2 ===================================================================
   3 --- nget.orig/auto_map.h        2007-05-29 20:11:08.000000000 +0200
   4 +++ nget/auto_map.h     2007-05-29 20:11:26.000000000 +0200
   5 @@ -53,11 +53,14 @@
   6                 auto_map_base& operator= (const auto_map_base &m); //private operator= to disallow assignment
   7  };
   8
   9 +template <class K, class T>
  10 +class default_map : public std::map<K, T> {
  11 +};
  12
  13  template <class K, class T>
  14 -class auto_map : public auto_map_base<K, T, std::map> {
  15 +class auto_map : public auto_map_base<K, T, default_map> {
  16         public:
  17 -               typedef typename auto_map_base<K, T, std::map>::super super;
  18 +               typedef typename auto_map_base<K, T, default_map>::super super;
  19                 typedef typename super::iterator iterator;
  20                 typedef typename super::value_type value_type;
  21                 /*super::value_type value_type(const K &k, T*p) {
  22 @@ -74,9 +77,13 @@
  23  };
  24
  25  template <class K, class T>
  26 -class auto_multimap : public auto_map_base<K, T, std::multimap> {
  27 +class default_multimap : public std::multimap<K, T> {
  28 +};
  29 +
  30 +template <class K, class T>
  31 +class auto_multimap : public auto_map_base<K, T, default_multimap> {
  32         public:
  33 -               typedef typename auto_map_base<K, T, std::multimap>::super super;
  34 +               typedef typename auto_map_base<K, T, default_multimap>::super super;
  35                 typedef typename super::iterator iterator;
  36                 typedef typename super::value_type value_type;
  37                 iterator insert_value(const K &k, T* p) { //we can't really use the normal insert funcs, but we don't want to just name it insert since it would be easy to confuse with all the normal map insert funcs