Subject: [Boost-commit] svn:boost r82052 - trunk/boost/graph/detail
From: jewillco_at_[hidden]
Date: 2012-12-17 12:37:40
Author: jewillco
Date: 2012-12-17 12:37:39 EST (Mon, 17 Dec 2012)
New Revision: 82052
URL: http://svn.boost.org/trac/boost/changeset/82052
Log:
Trying to fix defaults for StoredEdge; refs #7801
Text files modified:
trunk/boost/graph/detail/adjacency_list.hpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
Modified: trunk/boost/graph/detail/adjacency_list.hpp
==============================================================================
--- trunk/boost/graph/detail/adjacency_list.hpp (original)
+++ trunk/boost/graph/detail/adjacency_list.hpp 2012-12-17 12:37:39 EST (Mon, 17 Dec 2012)
@@ -309,14 +309,16 @@
public:
typedef Property property_type;
inline stored_ra_edge_iter() { }
- inline stored_ra_edge_iter(Vertex v, Iter i = Iter(),
- EdgeVec* edge_vec = 0)
+ inline explicit stored_ra_edge_iter(Vertex v) // Only used for comparisons
+ : stored_edge<Vertex>(v), m_i(0), m_vec(0){ }
+ inline stored_ra_edge_iter(Vertex v, Iter i, EdgeVec* edge_vec)
: stored_edge<Vertex>(v), m_i(i - edge_vec->begin()), m_vec(edge_vec){ }
- inline Property& get_property() { return (*m_vec)[m_i].get_property(); }
+ inline Property& get_property() { BOOST_ASSERT ((m_vec != 0)); return (*m_vec)[m_i].get_property(); }
inline const Property& get_property() const {
+ BOOST_ASSERT ((m_vec != 0));
return (*m_vec)[m_i].get_property();
}
- inline Iter get_iter() const { return m_vec->begin() + m_i; }
+ inline Iter get_iter() const { BOOST_ASSERT ((m_vec != 0)); return m_vec->begin() + m_i; }
protected:
std::size_t m_i;
EdgeVec* m_vec;