[Boost-commit] svn:boost r47078 - in branches/release: . boost doc libs/utility

From: daniel_james_at_[hidden]
Date: 2008-07-04 13:04:48

Author: danieljames
Date: 2008-07-04 13:04:47 EDT (Fri, 04 Jul 2008)
New Revision: 47078
URL: http://svn.boost.org/trac/boost/changeset/47078

Log:
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
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/boost/unordered_map.hpp |    12 ++++++++++++                            
   branches/release/boost/unordered_set.hpp |    12 ++++++++++++                            
   branches/release/doc/Jamfile.v2          |     3 ++-                                     
   branches/release/libs/utility/index.html |     2 +-                                      
   4 files changed, 27 insertions(+), 2 deletions(-)

Modified: branches/release/boost/unordered_map.hpp
==============================================================================
--- branches/release/boost/unordered_map.hpp	(original)
+++ branches/release/boost/unordered_map.hpp	2008-07-04 13:04:47 EDT (Fri, 04 Jul 2008)
@@ -422,9 +422,15 @@
             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 @@
             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>

Modified: branches/release/boost/unordered_set.hpp
==============================================================================
--- branches/release/boost/unordered_set.hpp	(original)
+++ branches/release/boost/unordered_set.hpp	2008-07-04 13:04:47 EDT (Fri, 04 Jul 2008)
@@ -392,9 +392,15 @@
             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 @@
             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>

Modified: branches/release/doc/Jamfile.v2
==============================================================================
--- branches/release/doc/Jamfile.v2	(original)
+++ branches/release/doc/Jamfile.v2	2008-07-04 13:04:47 EDT (Fri, 04 Jul 2008)
@@ -6,6 +6,8 @@
 project boost/doc ;
 import boostbook : boostbook ;
 
+alias asio : ../libs/asio/doc//asio ;
+
 boostbook doc
     :
     src/boost.xml
@@ -40,7 +42,6 @@
     <dependency>../libs/intrusive/doc//intrusive
     <dependency>../libs/units/doc//units
     <dependency>../libs/unordered/doc//unordered
-    <dependency>../libs/asio/doc//asio
     <dependency>../libs/thread/doc//thread
 
     ## Add path references to the QuickBook generated docs...

Modified: branches/release/libs/utility/index.html
==============================================================================
--- branches/release/libs/utility/index.html	(original)
+++ branches/release/libs/utility/index.html	2008-07-04 13:04:47 EDT (Fri, 04 Jul 2008)
@@ -29,7 +29,7 @@
                 <a href="value_init.htm">value_init</a></p>
                 </blockquote>
                 <hr>
-		<p>© Copyright Beman Dawes, 2001</p>
+		<p>&copy; Copyright Beman Dawes, 2001</p>
         <p>Distributed under the Boost Software License, Version 1.0. (See 
         accompanying file <a href="../../LICENSE_1_0.txt">
         LICENSE_1_0.txt</a> or copy at