From 56b9e0da1a393dc5de7109a051d8091b849fcf3e Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Fri, 4 Jul 2008 17:04:47 +0000
Subject: [PATCH] Merge some small fixes from trunk.

Merged revisions 46740,46742,47002,47040 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r46740 | danieljames | 2008-06-26 20:20:56 +0100 (Thu, 26 Jun 2008) | 1 line

  Fix a character encoding error.
........
  r46742 | danieljames | 2008-06-26 20:25:38 +0100 (Thu, 26 Jun 2008) | 6 lines

  Give the asio documentation its own target.

  The asio documentation is built with the rest of the combined documentation but
  is really separate. So give it its own target so that separate parts can be
  built separately.
........
  r47040 | danieljames | 2008-07-03 15:34:56 +0100 (Thu, 03 Jul 2008) | 1 line

  Workaround for some template syntax not supported in old versions of Visual C++ 6.5
........


[SVN r47078]
---
 include/boost/unordered_map.hpp | 12 ++++++++++++
 include/boost/unordered_set.hpp | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/include/boost/unordered_map.hpp b/include/boost/unordered_map.hpp
index cf6562b3..093c7697 100644
--- a/include/boost/unordered_map.hpp
+++ b/include/boost/unordered_map.hpp
@@ -422,9 +422,15 @@ namespace boost
             base.rehash(n);
         }
         
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+        friend bool operator==(unordered_map const&, unordered_map const&);
+        friend bool operator!=(unordered_map const&, unordered_map const&);
+        friend std::size_t hash_value(unordered_map const&);
+#else
         friend bool operator==<>(unordered_map const&, unordered_map const&);
         friend bool operator!=<>(unordered_map const&, unordered_map const&);
         friend std::size_t hash_value<>(unordered_map const&);
+#endif
     }; // class template unordered_map
 
     template <class K, class T, class H, class P, class A>
@@ -796,9 +802,15 @@ namespace boost
             base.rehash(n);
         }
 
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+        friend bool operator==(unordered_multimap const&, unordered_multimap const&);
+        friend bool operator!=(unordered_multimap const&, unordered_multimap const&);
+        friend std::size_t hash_value(unordered_multimap const&);
+#else
         friend bool operator==<>(unordered_multimap const&, unordered_multimap const&);
         friend bool operator!=<>(unordered_multimap const&, unordered_multimap const&);
         friend std::size_t hash_value<>(unordered_multimap const&);
+#endif
     }; // class template unordered_multimap
 
     template <class K, class T, class H, class P, class A>
diff --git a/include/boost/unordered_set.hpp b/include/boost/unordered_set.hpp
index f68502e3..1addae10 100644
--- a/include/boost/unordered_set.hpp
+++ b/include/boost/unordered_set.hpp
@@ -392,9 +392,15 @@ namespace boost
             base.rehash(n);
         }
 
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+        friend bool operator==(unordered_set const&, unordered_set const&);
+        friend bool operator!=(unordered_set const&, unordered_set const&);
+        friend std::size_t hash_value(unordered_set const&);
+#else
         friend bool operator==<>(unordered_set const&, unordered_set const&);
         friend bool operator!=<>(unordered_set const&, unordered_set const&);
         friend std::size_t hash_value<>(unordered_set const&);
+#endif
     }; // class template unordered_set
 
     template <class T, class H, class P, class A>
@@ -752,9 +758,15 @@ namespace boost
             base.rehash(n);
         }
 
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+        friend bool operator==(unordered_multiset const&, unordered_multiset const&);
+        friend bool operator!=(unordered_multiset const&, unordered_multiset const&);
+        friend std::size_t hash_value(unordered_multiset const&);
+#else
         friend bool operator==<>(unordered_multiset const&, unordered_multiset const&);
         friend bool operator!=<>(unordered_multiset const&, unordered_multiset const&);
         friend std::size_t hash_value<>(unordered_multiset const&);
+#endif
     }; // class template unordered_multiset
 
     template <class T, class H, class P, class A>