Compare commits

...

5 Commits

Author SHA1 Message Date
nobody 892bc47bd6 This commit was manufactured by cvs2svn to create tag
'Version_1_30_2'.

[SVN r19685]
2003-08-18 18:40:31 +00:00
Vladimir Prus d347855d50 Merge 1.30.
[SVN r17857]
2003-03-12 15:50:37 +00:00
Vladimir Prus d3db10adba Merged 1.3.
[SVN r17856]
2003-03-12 15:46:56 +00:00
Vladimir Prus adea277486 Merge of 1.48 to RC_1_30_0.
[SVN r17766]
2003-03-07 16:17:25 +00:00
nobody 8669942153 This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'.
[SVN r17693]
2003-03-01 19:43:06 +00:00
3 changed files with 7 additions and 6 deletions
+1
View File
@@ -56,6 +56,7 @@ namespace boost {
struct property_traits<default_color_type*> {
typedef default_color_type value_type;
typedef std::ptrdiff_t key_type;
typedef default_color_type& reference;
typedef lvalue_property_map_tag category;
};
// get/put already defined for T*
+3 -3
View File
@@ -58,9 +58,9 @@ namespace boost {
class PredecessorMap, class DistanceMap,
class BinaryFunction, class BinaryPredicate>
bool relax(typename graph_traits<Graph>::edge_descriptor e,
const Graph& g, WeightMap w,
PredecessorMap p, DistanceMap d,
BinaryFunction combine, BinaryPredicate compare)
const Graph& g, const WeightMap& w,
PredecessorMap& p, DistanceMap& d,
const BinaryFunction& combine, const BinaryPredicate& compare)
{
typedef typename graph_traits<Graph>::directed_category DirCat;
bool is_undirected = is_same<DirCat, undirected_tag>::value;
+3 -3
View File
@@ -49,14 +49,14 @@
namespace boost {
template <class TreeNode, class Compare, class ExternalData>
inline TreeNode up_heap(TreeNode x, Compare comp, ExternalData& edata) {
inline TreeNode up_heap(TreeNode x, const Compare& comp, ExternalData& edata) {
while (x.has_parent() && comp(x, x.parent()))
x.swap(x.parent(), edata);
return x;
}
template <class TreeNode, class Compare, class ExternalData>
inline TreeNode down_heap(TreeNode x, Compare comp, ExternalData& edata) {
inline TreeNode down_heap(TreeNode x, const Compare& comp, ExternalData& edata) {
while (x.children().size() > 0) {
typename TreeNode::children_type::iterator
child_iter = std::min_element(x.children().begin(),
@@ -71,7 +71,7 @@ namespace boost {
}
template <class TreeNode, class Compare, class ExternalData>
inline void update_heap(TreeNode x, Compare comp, ExternalData& edata) {
inline void update_heap(TreeNode x, const Compare& comp, ExternalData& edata) {
x = down_heap(x, comp, edata);
(void)up_heap(x, comp, edata);
}