#
#
# patch "ChangeLog"
# from [94db1bbadd50774d5972335b2b24913e5cac2abc]
# to [deec0be655e1c2e529a2a54734ef82fa3ef10e53]
#
# patch "hash_map.hh"
# from [09875b4cfb4cad706ebad82bf7a590f61bbb6c6c]
# to [e41d072bd44ec043f9dbd8d0f15017516f819392]
#
============================================================
--- ChangeLog 94db1bbadd50774d5972335b2b24913e5cac2abc
+++ ChangeLog deec0be655e1c2e529a2a54734ef82fa3ef10e53
@@ -1,3 +1,8 @@
+2006-06-28 Matthew Gregan
+
+ * hash_map.hh: %s/_T/T/g; _T is reserved for the implementation,
+ and attempting to use it results in compile failures on OS X 10.3.
+
2006-06-24 Richard Levitte
* Changelog: Convert all CRLF to LF.
============================================================
--- hash_map.hh 09875b4cfb4cad706ebad82bf7a590f61bbb6c6c
+++ hash_map.hh e41d072bd44ec043f9dbd8d0f15017516f819392
@@ -6,22 +6,22 @@
#include
namespace hashmap {
- template
- class equal_to : public std::equal_to<_T>
+ template
+ class equal_to : public std::equal_to
{
- // bool operator()(_T const & b, _T const & b) const;
+ // bool operator()(T const & b, T const & b) const;
};
- template
- class less : public std::less<_T>
+ template
+ class less : public std::less
{
- // bool operator()(_T const & b, _T const & b) const;
+ // bool operator()(T const & b, T const & b) const;
};
- template
+ template
struct hash
{
- // size_t operator()(_T const & t) const;
+ // size_t operator()(T const & t) const;
};
template<>
@@ -145,20 +145,20 @@
}
};
- template
+ template
struct hash_traits
{
static const size_t bucket_size = 4;
static const size_t min_buckets = 8;
- less<_T> lt;
- hash<_T> h;
+ less lt;
+ hash h;
- size_t operator( )(_T const & s) const
+ size_t operator( )(T const & s) const
{
return h(s);
}
- bool operator( )(_T const & a,
- _T const & b) const
+ bool operator( )(T const & a,
+ T const & b) const
{
return lt(a, b);
}