Commit 115b480f authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

Remove internal properties from run_action code

parent 025fe7d6
...@@ -130,7 +130,9 @@ def inline(g, code, arg_names=[], local_dict=None, ...@@ -130,7 +130,9 @@ def inline(g, code, arg_names=[], local_dict=None,
# check if exception was thrown # check if exception was thrown
if ret_vals["__exception_thrown"]: if ret_vals["__exception_thrown"]:
libgraph_tool_core.raise_error(ret_vals["__exception_error"]) libgraph_tool_core.raise_error(ret_vals["__exception_error"])
else:
del ret_vals["__exception_thrown"]
del ret_vals["__exception_error"]
sys.setdlopenflags(orig_dlopen_flags) # reset dlopen to normal case to sys.setdlopenflags(orig_dlopen_flags) # reset dlopen to normal case to
# avoid unnecessary symbol collision # avoid unnecessary symbol collision
return ret_vals return ret_vals
...@@ -40,8 +40,7 @@ template <class Action> ...@@ -40,8 +40,7 @@ template <class Action>
void RunAction(GraphInterface &g, const Action& a) void RunAction(GraphInterface &g, const Action& a)
{ {
run_action<>()(g, lambda::bind<void>(a, lambda::_1, g._vertex_index, run_action<>()(g, lambda::bind<void>(a, lambda::_1, g._vertex_index,
g._edge_index, g._edge_index))();
lambda::var(g._properties)))();
} }
} }
...@@ -67,8 +66,7 @@ struct action_${code_hash} ...@@ -67,8 +66,7 @@ struct action_${code_hash}
template <class Graph, class VertexIndex, class EdgeIndex> template <class Graph, class VertexIndex, class EdgeIndex>
void operator()(Graph* __gp, VertexIndex vertex_index, void operator()(Graph* __gp, VertexIndex vertex_index,
EdgeIndex edge_index, EdgeIndex edge_index) const
dynamic_properties& properties) const
{ {
Graph& g = *__gp; Graph& g = *__gp;
// convenience typedefs // convenience typedefs
......
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