yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3737
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
timestamp: Tue 2015-11-10 18:44:56 +0100
message:
  fix ambiguous syntax, fixing https://bugs.launchpad.net/bugs/1514477
modified:
  lib/triangulation/TriaxialState.cpp


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'lib/triangulation/TriaxialState.cpp'
--- lib/triangulation/TriaxialState.cpp	2014-07-02 18:26:05 +0000
+++ lib/triangulation/TriaxialState.cpp	2015-11-10 17:44:56 +0000
@@ -116,7 +116,7 @@
 		Tes.Clear();
 		GrainIterator git = grains_begin();
 		GrainIterator last = grains_end();
-		Tes.vertexHandles.resize(grains.size()+ NO_ZERO_ID ? 1 : 0);
+		Tes.vertexHandles.resize(grains.size()+ (NO_ZERO_ID ? 1 : 0));
 		for (; git!=last; ++git) {
 			if (git->id != -1 /*&& git->isSphere*/)	Tes.vertexHandles[git->id] = Tes.insert(git->sphere.x(), git->sphere.y(), git->sphere.z(), git->sphere.weight(),git->id,!git->isSphere);
 			//vh->->info() = git->translation; FIXME : this could define displacements in the triangulation itself