diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-11-02 13:44:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-11-02 13:44:07 +0100 |
| commit | a98c85bb501e9021c0d8d509b8c040611d4c0c3a (patch) | |
| tree | 61dc69fc1cbf886aee6c2934e8efc6b57c3462bb /storage/oqgraph | |
| parent | c18054deb2b5cfcf1f13aa71574406f2bafb87c6 (diff) | |
| parent | 7196691b44b65e12cb5cca6f17c8d0f091eb443f (diff) | |
| download | mariadb-git-a98c85bb501e9021c0d8d509b8c040611d4c0c3a.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/graphcore.cc | 2 | ||||
| -rw-r--r-- | storage/oqgraph/oqgraph_shim.h | 48 |
2 files changed, 28 insertions, 22 deletions
diff --git a/storage/oqgraph/graphcore.cc b/storage/oqgraph/graphcore.cc index 4346b94805c..7c8ca53c096 100644 --- a/storage/oqgraph/graphcore.cc +++ b/storage/oqgraph/graphcore.cc @@ -485,7 +485,7 @@ namespace open_query optional<Vertex> oqgraph_share::find_vertex(VertexID id) const { - return ::boost::find_vertex(id, g); + return oqgraph3::find_vertex(id, g); } #if 0 diff --git a/storage/oqgraph/oqgraph_shim.h b/storage/oqgraph/oqgraph_shim.h index af240b88ebd..004d7f0f7c5 100644 --- a/storage/oqgraph/oqgraph_shim.h +++ b/storage/oqgraph/oqgraph_shim.h @@ -274,6 +274,33 @@ namespace boost }; #endif + template<> + struct property_map<oqgraph3::graph, edge_weight_t> + { + typedef void type; + typedef oqgraph3::edge_weight_property_map const_type; + }; + + template<> + struct property_map<oqgraph3::graph, vertex_index_t> + { + typedef void type; + typedef oqgraph3::vertex_index_property_map const_type; + }; + + template<> + struct property_map<oqgraph3::graph, edge_index_t> + { + typedef void type; + typedef oqgraph3::edge_index_property_map const_type; + }; + +} + +namespace oqgraph3 +{ + using namespace boost; + inline graph_traits<oqgraph3::graph>::vertex_descriptor source( const graph_traits<oqgraph3::graph>::edge_descriptor& e, @@ -401,27 +428,6 @@ namespace boost return count; } - template<> - struct property_map<oqgraph3::graph, edge_weight_t> - { - typedef void type; - typedef oqgraph3::edge_weight_property_map const_type; - }; - - template<> - struct property_map<oqgraph3::graph, vertex_index_t> - { - typedef void type; - typedef oqgraph3::vertex_index_property_map const_type; - }; - - template<> - struct property_map<oqgraph3::graph, edge_index_t> - { - typedef void type; - typedef oqgraph3::edge_index_property_map const_type; - }; - inline property_map< oqgraph3::graph, edge_weight_t>::const_type::reference |