This commit was manufactured by cvs2svn to create tag

'merged_to_RC_1_33_0'.

[SVN r31853]

include/boost/graph/detail/adjacency_list.hpp

@@ -13,6 +13,7 @@
 
 #include <map> // for vertex_map in copy_impl
 #include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 #include <boost/operators.hpp>
 #include <boost/property_map.hpp>
 #include <boost/pending/integer_range.hpp>
@@ -2669,12 +2670,16 @@ namespace boost {
 #if !defined(BOOST_NO_HASH) && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 namespace BOOST_STD_EXTENSION_NAMESPACE {
 
+  #if BOOST_WORKAROUND( _STLPORT_VERSION, >= 0x500 )
+  // STLport 5 already defines a hash<void*> specialization.
+  #else
   template <>
   struct hash< void* > // Need this when vertex_descriptor=void*
   {
     std::size_t
     operator()(void* v) const { return (std::size_t)v; }
   };
+  #endif
 
   template <typename V>
   struct hash< boost::detail::stored_edge<V> > 

src/graphviz_digraph_parser.cpp

@@ -46,6 +46,9 @@
 #include <sstream>
 #endif
 
+using std::free;
+using std::malloc;
+
 #ifndef GRAPHVIZ_DIRECTED
 #error Need to define the GRAPHVIZ_DIRECTED macro to either 0 or 1
 #endif 

src/graphviz_graph_parser.cpp

@@ -46,6 +46,9 @@
 #include <sstream>
 #endif
 
+using std::free;
+using std::malloc;
+
 #ifndef GRAPHVIZ_DIRECTED
 #error Need to define the GRAPHVIZ_DIRECTED macro to either 0 or 1
 #endif 

src/graphviz_parser.yy

@@ -24,6 +24,9 @@
 #include <sstream>
 #endif
 
+using std::free;
+using std::malloc;
+
 #ifndef GRAPHVIZ_DIRECTED
 #error Need to define the GRAPHVIZ_DIRECTED macro to either 0 or 1
 #endif