Skip to content

fix compilation on GCC 7.3.0 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gevorgvoskanyan merged 1 commit into from
Oct 11, 2020
Merged

fix compilation on GCC 7.3.0 #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/calcFuncs.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ void * integrateParticles ( void * arg_ )
Vi v, vend;
int vertexCount = num_vertices( layout_graph.boostGraph() );
tie( v , vend ) = vertices( layout_graph.boostGraph() );
if ( whichThread != 0 ) { advance( v , whichThread ); }
if ( whichThread != 0 ) { std::advance( v , whichThread ); }
for ( int vctr = whichThread; vctr<vertexCount; vctr+=threadCount ) {
if ( vctr != whichThread ) { advance( v , threadCount ); }
if ( vctr != whichThread ) { std::advance( v , threadCount ); }
//cout << *v << " " << levels.size() << endl;
if ( levels[*v] > currentLevel ) { continue; }
//cout << *v << " -" << endl;
Expand Down Expand Up @@ -115,10 +115,10 @@ void * collectEdgeStats( void * arg_ )
prec_t dx = 0;
Ei ei , eend;
tie( ei , eend ) = edges( layout_graph.boostGraph() );
if ( whichThread != 0 ) { advance( ei , whichThread ); }
if ( whichThread != 0 ) { std::advance( ei , whichThread ); }
for ( int ectr = whichThread; ectr<edgeCount; ectr+=threadCount )
{
if ( ectr != whichThread ) { advance( ei , threadCount ); }
if ( ectr != whichThread ) { std::advance( ei , threadCount ); }
vertex_descriptor v1 = source( *ei , layout_graph.boostGraph() );
vertex_descriptor v2 = target( *ei , layout_graph.boostGraph() );
if ( levels[ v1 ] == currentLevel ||
Expand Down Expand Up @@ -151,7 +151,7 @@ void * onlyEdgeInteractions( void * arg_ )
int edgeCount = num_edges( layout_graph.boostGraph() );
Ei ei , eend;
tie( ei , eend ) = edges( layout_graph.boostGraph() );
if ( whichThread != 0 ) { advance( ei , whichThread ); }
if ( whichThread != 0 ) { std::advance( ei , whichThread ); }
for ( int ectr = whichThread; ectr<edgeCount; ectr+=threadCount )
{
if ( ectr != whichThread ) { std::advance( ei , threadCount ); }
Expand Down