yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3538
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Mon 2014-11-17 15:21:10 +0100
message:
  Add some missing #ifdef YADE_CGAL.
modified:
  pkg/dem/MicroMacroAnalyser.hpp
  pkg/dem/TesselationWrapper.hpp


--
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/MicroMacroAnalyser.hpp'
--- pkg/dem/MicroMacroAnalyser.hpp	2014-10-15 06:44:01 +0000
+++ pkg/dem/MicroMacroAnalyser.hpp	2014-11-17 14:21:10 +0000
@@ -5,6 +5,7 @@
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
+#ifdef YADE_CGAL
 
 #pragma once
 
@@ -64,4 +65,4 @@
 
 REGISTER_SERIALIZABLE(MicroMacroAnalyser);
 
-
+#endif /* YADE_CGAL */

=== modified file 'pkg/dem/TesselationWrapper.hpp'
--- pkg/dem/TesselationWrapper.hpp	2014-10-15 06:44:01 +0000
+++ pkg/dem/TesselationWrapper.hpp	2014-11-17 14:21:10 +0000
@@ -5,6 +5,8 @@
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
+#ifdef YADE_CGAL
+
 #pragma once
 #include<core/GlobalEngine.hpp>
 #include<pkg/common/Sphere.hpp>
@@ -137,3 +139,5 @@
 };
 REGISTER_SERIALIZABLE(TesselationWrapper);
 //} // namespace CGT
+
+#endif /* YADE_CGAL */