yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #12630
[Branch ~yade-pkg/yade/git-trunk] Rev 3849: Undef NDEBUG in all polyhedra files.
------------------------------------------------------------
revno: 3849
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Tue 2016-04-19 22:18:46 +0200
message:
Undef NDEBUG in all polyhedra files.
Otherwise cgal crashes sometimes in optimized builds.
modified:
pkg/dem/Polyhedra.cpp
pkg/dem/Polyhedra_Ig2.cpp
pkg/dem/Polyhedra_splitter.cpp
pkg/dem/Polyhedra_support.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 'pkg/dem/Polyhedra.cpp'
--- pkg/dem/Polyhedra.cpp 2016-04-19 01:27:38 +0000
+++ pkg/dem/Polyhedra.cpp 2016-04-19 20:18:46 +0000
@@ -2,7 +2,10 @@
// https://www.vutbr.cz/www_base/gigadisk.php?i=95194aa9a
#ifdef YADE_CGAL
-
+// NDEBUG causes crashes in CGAL sometimes. Anton
+#ifdef NDEBUG
+ #undef NDEBUG
+#endif
#include "Polyhedra.hpp"
YADE_PLUGIN(/* self-contained in hpp: */ (Polyhedra) (PolyhedraGeom) (Bo1_Polyhedra_Aabb) (PolyhedraPhys) (PolyhedraMat) (Ip2_PolyhedraMat_PolyhedraMat_PolyhedraPhys) (Ip2_FrictMat_PolyhedraMat_FrictPhys) (Law2_PolyhedraGeom_PolyhedraPhys_Volumetric)
=== modified file 'pkg/dem/Polyhedra_Ig2.cpp'
--- pkg/dem/Polyhedra_Ig2.cpp 2016-04-13 16:42:10 +0000
+++ pkg/dem/Polyhedra_Ig2.cpp 2016-04-19 20:18:46 +0000
@@ -2,7 +2,10 @@
// https://www.vutbr.cz/www_base/gigadisk.php?i=95194aa9a
#ifdef YADE_CGAL
-
+// NDEBUG causes crashes in CGAL sometimes. Anton
+#ifdef NDEBUG
+ #undef NDEBUG
+#endif
#include "Polyhedra_Ig2.hpp"
YADE_PLUGIN(/* self-contained in hpp: */ (Ig2_Polyhedra_Polyhedra_PolyhedraGeom) (Ig2_Wall_Polyhedra_PolyhedraGeom) (Ig2_Facet_Polyhedra_PolyhedraGeom) (Ig2_Sphere_Polyhedra_ScGeom)
=== modified file 'pkg/dem/Polyhedra_splitter.cpp'
--- pkg/dem/Polyhedra_splitter.cpp 2016-03-24 22:08:26 +0000
+++ pkg/dem/Polyhedra_splitter.cpp 2016-04-19 20:18:46 +0000
@@ -3,6 +3,11 @@
#ifdef YADE_CGAL
+// NDEBUG causes crashes in CGAL sometimes. Anton
+#ifdef NDEBUG
+ #undef NDEBUG
+#endif
+
#include <pkg/dem/Polyhedra_splitter.hpp>
YADE_PLUGIN((PolyhedraSplitter));
=== modified file 'pkg/dem/Polyhedra_support.cpp'
--- pkg/dem/Polyhedra_support.cpp 2016-04-12 04:37:00 +0000
+++ pkg/dem/Polyhedra_support.cpp 2016-04-19 20:18:46 +0000
@@ -2,6 +2,10 @@
// https://www.vutbr.cz/www_base/gigadisk.php?i=95194aa9a
#ifdef YADE_CGAL
+// NDEBUG causes crashes in CGAL sometimes. Anton
+#ifdef NDEBUG
+ #undef NDEBUG
+#endif
#include "Polyhedra.hpp"