# HG changeset patch # User Nicolas Saunier # Date 1397098143 14400 # Node ID 46b5cb3f3114c28da46e18ae0d94edabe7d52ae2 # Parent a5847c0ca27c3de8cfc0e13ba23f8c7944c253c7 correction to compile on Windows diff -r a5847c0ca27c -r 46b5cb3f3114 c/Motion.cpp --- a/c/Motion.cpp Thu Apr 03 17:48:27 2014 -0400 +++ b/c/Motion.cpp Wed Apr 09 22:49:03 2014 -0400 @@ -169,7 +169,7 @@ if (ft->minMaxSimilarity(*ft2, firstInstant, lastInstant, connectionDistance, segmentationDistance)) { UndirectedGraph::edge_descriptor e; bool unused; - tie(e, unused) = add_edge(newVertex, *vi, graph); + boost::tuples::tie(e, unused) = add_edge(newVertex, *vi, graph); // no need to add measures to graph[e] (edge properties) } } @@ -190,7 +190,7 @@ vector > tmpobjects(num), objects; // vector of components (component = vector of vertex descriptors) graph_traits::vertex_iterator vi, vend; - for(tie(vi,vend) = vertices(graph); vi != vend; ++vi) { + for(boost::tuples::tie(vi,vend) = vertices(graph); vi != vend; ++vi) { unsigned int id = components[*vi]; lastInstants[id] = max(lastInstants[id], graph[*vi].feature->getLastInstant()); tmpobjects[id].push_back(*vi); @@ -249,6 +249,6 @@ void FeatureGraph::computeVertexIndex(void) { graph_traits::vertex_iterator vi, vend; graph_traits::vertices_size_type cnt = 0; - for(tie(vi,vend) = vertices(graph); vi != vend; ++vi) + for(boost::tuples::tie(vi,vend) = vertices(graph); vi != vend; ++vi) graph[*vi].index = cnt++; }