|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r50704 - trunk/boost/graph
From: jewillco_at_[hidden]
Date: 2009-01-21 12:21:07
Author: jewillco
Date: 2009-01-21 12:21:06 EST (Wed, 21 Jan 2009)
New Revision: 50704
URL: http://svn.boost.org/trac/boost/changeset/50704
Log:
Fixed some regression test failures
Text files modified:
trunk/boost/graph/is_kuratowski_subgraph.hpp | 14 +++++++-------
trunk/boost/graph/relax.hpp | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
Modified: trunk/boost/graph/is_kuratowski_subgraph.hpp
==============================================================================
--- trunk/boost/graph/is_kuratowski_subgraph.hpp (original)
+++ trunk/boost/graph/is_kuratowski_subgraph.hpp 2009-01-21 12:21:06 EST (Wed, 21 Jan 2009)
@@ -97,6 +97,8 @@
}
+ enum target_graph_t { tg_k_3_3, tg_k_5};
+
} // namespace detail
@@ -123,9 +125,7 @@
typedef adjacency_list<vecS, vecS, undirectedS> small_graph_t;
- enum target_graph_t { k_3_3, k_5};
-
- target_graph_t target_graph = k_3_3; //unless we decide otherwise later
+ detail::target_graph_t target_graph = detail::tg_k_3_3; //unless we decide otherwise later
static small_graph_t K_5(detail::make_K_5<small_graph_t>());
@@ -245,11 +245,11 @@
for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
if (neighbors[*vi].size() == 4)
{
- target_graph = k_5;
+ target_graph = detail::tg_k_5;
break;
}
- if (target_graph == k_3_3)
+ if (target_graph == detail::tg_k_3_3)
break;
}
@@ -299,11 +299,11 @@
}
}
- if (target_graph == k_5)
+ if (target_graph == detail::tg_k_5)
{
return isomorphism(K_5,contracted_graph);
}
- else //target_graph == k_3_3
+ else //target_graph == tg_k_3_3
{
return isomorphism(K_3_3,contracted_graph);
}
Modified: trunk/boost/graph/relax.hpp
==============================================================================
--- trunk/boost/graph/relax.hpp (original)
+++ trunk/boost/graph/relax.hpp 2009-01-21 12:21:06 EST (Wed, 21 Jan 2009)
@@ -27,7 +27,7 @@
T zero(0);
T result = a + b;
if (result < zero && a >= zero && b >= zero)
- return (numeric_limits<T>::max)();
+ return (std::numeric_limits<T>::max)();
return result;
}
};
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk