[Boost-commit] svn:boost r45314 - sandbox/cluster/boost/algorithm/cluster

From: franklin.jonathan_at_[hidden]
Date: 2008-05-12 23:14:27

Author: jfranklin
Date: 2008-05-12 23:14:26 EDT (Mon, 12 May 2008)
New Revision: 45314
URL: http://svn.boost.org/trac/boost/changeset/45314

Log:
Fixed a couple of build problems with g++.

Text files modified: 
   sandbox/cluster/boost/algorithm/cluster/cluster_data.hpp |     2 +-                                      
   sandbox/cluster/boost/algorithm/cluster/dbscan.hpp       |     9 +++++----                               
   2 files changed, 6 insertions(+), 5 deletions(-)

Modified: sandbox/cluster/boost/algorithm/cluster/cluster_data.hpp
==============================================================================
--- sandbox/cluster/boost/algorithm/cluster/cluster_data.hpp	(original)
+++ sandbox/cluster/boost/algorithm/cluster/cluster_data.hpp	2008-05-12 23:14:26 EDT (Mon, 12 May 2008)
@@ -27,7 +27,7 @@
   ~cluster_data() {}
 
   cluster_data(cluster_data const & c) : m_pClusters(c.m_pClusters) {}
-  cluster_data const & cluster_data::operator=(cluster_data const & rhs)
+  cluster_data const & operator=(cluster_data const & rhs)
   { m_pClusters = rhs.m_pClusters; }
 
   typedef typename clusters::iterator iterator;

Modified: sandbox/cluster/boost/algorithm/cluster/dbscan.hpp
==============================================================================
--- sandbox/cluster/boost/algorithm/cluster/dbscan.hpp	(original)
+++ sandbox/cluster/boost/algorithm/cluster/dbscan.hpp	2008-05-12 23:14:26 EDT (Mon, 12 May 2008)
@@ -80,7 +80,8 @@
 
   // TODO: We should try to make cluster_num go away.
   int cluster_num = 0;
-  for(ntuple_nodes::iterator it = tuples.begin(); it != tuples.end(); ++it)
+  for(typename ntuple_nodes::iterator it = tuples.begin();
+      it != tuples.end(); ++it)
   {
     // Skip this tuple if its already been classified as a cluster or noise.
     if (it->cluster != detail::UNCLASSIFIED)
@@ -88,7 +89,7 @@
 
     // Expand cluster.
 
-    std::vector<ntuple_nodes::iterator> seeds;
+    std::vector<typename ntuple_nodes::iterator> seeds;
     detail::naive_query(it, tuples.begin(), tuples.end(), eps, d, seeds);
     // If the neighborhood of this tuple is too small, then mark it as noise.
     if (seeds.size() < min_points)
@@ -115,10 +116,10 @@
     // are Density Reachable.
     while (! seeds.empty())
     {
-      ntuple_nodes::iterator cur = seeds.back();
+      typename ntuple_nodes::iterator cur = seeds.back();
       seeds.pop_back();
 
-      std::vector<ntuple_nodes::iterator> results;
+      std::vector<typename ntuple_nodes::iterator> results;
       detail::naive_query(cur, tuples.begin(), tuples.end(), eps, d, results);
 
       if (results.size() >= min_points)