Commit d997442a authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

* src/graph/graph.cc (GraphInterface::LabelParallelEdges): use long instead of...

* src/graph/graph.cc (GraphInterface::LabelParallelEdges): use long instead of size_t for parallel edges property.

* src/graph/graph_properties.cc: call size_t by "size_t" not "long", since those are not the same type. This removes a bug where it is impossible to create/edit properties with type long.

* src/graph/graph.cc (GraphInterface::LabelParallelEdges): use vector_property_map instead of HashedDescriptorMap.


git-svn-id: https://svn.forked.de/graph-tool/trunk@120 d4600afd-f417-0410-95de-beed9576f240
parent 81c63f0f
2007-08-01 Tiago de Paula Peixoto <tiago@forked.de>
* src/graph/graph.cc (GraphInterface::LabelParallelEdges): use long instead of size_t for parallel edges property.
* src/graph/graph_properties.cc: call size_t by "size_t" not "long", since those are not the same type. This removes a bug where it is impossible to create/edit properties with type long.
* src/graph/graph.cc (GraphInterface::LabelParallelEdges): use vector_property_map instead of HashedDescriptorMap.
2007-07-31 Tiago de Paula Peixoto <tiago@forked.de>
......
......@@ -432,7 +432,7 @@ void GraphInterface::LabelParallelEdges(string property)
}
catch (property_not_found)
{
typedef vector_property_map<size_t,edge_index_map_t> parallel_map_t;
typedef vector_property_map<long,edge_index_map_t> parallel_map_t;
parallel_map_t parallel_map(_edge_index);
check_filter(*this, bind<void>(label_parallel_edges(), _1, _edge_index, parallel_map), reverse_check(), directed_check());
_properties.property(property, parallel_map);
......
......@@ -37,10 +37,10 @@ using namespace graph_tool;
namespace graph_tool
{
// global property types
const char* type_names[] = {"boolean", "int", "long", "long", "float", "double", "string"};
const char* type_names[] = {"boolean", "int", "long", "size_t", "float", "double", "string"};
// scalar types
const char* scalar_names[] = {"boolean", "int", "long", "long", "float", "double"};
const char* scalar_names[] = {"boolean", "int", "long", "size_t", "float", "double"};
}
//==============================================================================
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment