yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3911
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Thu 2014-04-10 15:39:24 +0200
message:
  Add YADE_SPH macroses to fix FTBFS, when SPH disabled
  
  Thanks Jan for pointing that out.
modified:
  pkg/dem/ViscoelasticPM.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/ViscoelasticPM.hpp'
--- pkg/dem/ViscoelasticPM.hpp	2014-04-09 14:03:16 +0000
+++ pkg/dem/ViscoelasticPM.hpp	2014-04-10 13:39:24 +0000
@@ -62,8 +62,10 @@
 		((unsigned int,mRtype,1,,"Rolling resistance type, see [Zhou1999536]_. mRtype=1 - equation (3) in [Zhou1999536]_; mRtype=2 - equation (4) in [Zhou1999536]_")),
 		createIndex();
 	)
+#ifdef YADE_SPH
 		KernelFunction kernelFunctionCurrentPressure;
 		KernelFunction kernelFunctionCurrentVisco;
+#ifdef YADE_SPH
 	REGISTER_CLASS_INDEX(ViscElPhys,FrictPhys);
 };
 REGISTER_SERIALIZABLE(ViscElPhys);