yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3724
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Thu 2015-09-17 08:00:22 +0200
message:
  Fix compilation if openmp is disabled
modified:
  lib/triangulation/FlowBoundingSphere.ipp
  lib/triangulation/FlowBoundingSphereLinSolv.ipp
  lib/triangulation/PeriodicFlowLinSolv.ipp


--
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/FlowBoundingSphere.ipp'
--- lib/triangulation/FlowBoundingSphere.ipp	2015-03-26 09:16:03 +0000
+++ lib/triangulation/FlowBoundingSphere.ipp	2015-09-17 06:00:22 +0000
@@ -18,14 +18,14 @@
 #include <assert.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <omp.h>
 
 #ifdef XVIEW
 // #include "Vue3D.h" //FIXME implicit dependencies will look for this class (out of tree) even ifndef XVIEW
 #endif
 
 #ifdef YADE_OPENMP
-//   #define GS_OPEN_MP //It should never be defined if Yade is not using openmp
+  #include <omp.h>
+  #define GS_OPEN_MP //It should never be defined if Yade is not using openmp
 #endif
 
 // #define USE_FAST_MATH 1

=== modified file 'lib/triangulation/FlowBoundingSphereLinSolv.ipp'
--- lib/triangulation/FlowBoundingSphereLinSolv.ipp	2014-10-29 16:49:20 +0000
+++ lib/triangulation/FlowBoundingSphereLinSolv.ipp	2015-09-17 06:00:22 +0000
@@ -19,15 +19,14 @@
 #include <assert.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <omp.h>
-
 
 #ifdef XVIEW
 //#include "Vue3D.h" //FIXME implicit dependencies will look for this class (out of tree) even ifndef XVIEW
 #endif
 
 #ifdef YADE_OPENMP
-//   #define GS_OPEN_MP //It should never be defined if Yade is not using openmp
+  #include <omp.h>
+  #define GS_OPEN_MP //It should never be defined if Yade is not using openmp
 #endif
 
 // #define PARDISO //comment this if pardiso lib is not available

=== modified file 'lib/triangulation/PeriodicFlowLinSolv.ipp'
--- lib/triangulation/PeriodicFlowLinSolv.ipp	2014-07-02 16:18:24 +0000
+++ lib/triangulation/PeriodicFlowLinSolv.ipp	2015-09-17 06:00:22 +0000
@@ -18,8 +18,10 @@
 #include <assert.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <omp.h>
 
+#ifdef YADE_OPENMP
+  #include <omp.h>
+#endif
 
 namespace CGT
 {