← Back to team overview

yade-dev team mailing list archive

[Branch ~yade-pkg/yade/git-trunk] Rev 3385: -add UnsatVertexInfo(void) for future use

 

------------------------------------------------------------
revno: 3385
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Tue 2013-11-19 09:34:00 +0100
message:
  -add UnsatVertexInfo(void) for future use
modified:
  lib/triangulation/FlowBoundingSphere.cpp
  lib/triangulation/def_types.h


--
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.cpp'
--- lib/triangulation/FlowBoundingSphere.cpp	2013-07-26 14:55:13 +0000
+++ lib/triangulation/FlowBoundingSphere.cpp	2013-11-19 08:34:00 +0000
@@ -18,11 +18,11 @@
 //Forcing instanciation of the template to avoid linkage problems 
 typedef CGT::FlowBoundingSphere<FlowTesselation> FlowBoundingSphere;
 FlowBoundingSphere ex;
+typedef CGT::FlowBoundingSphere<UnsatTesselation> UnsatFlowBoundingSphere;
+UnsatFlowBoundingSphere unex;
 #ifdef LINSOLV
 typedef CGT::FlowBoundingSphereLinSolv<FlowBoundingSphere> FlowBoundingSphereLinSolv;
 FlowBoundingSphereLinSolv exls;
-typedef CGT::FlowBoundingSphere<UnsatTesselation> UnsatFlowBoundingSphere;
-UnsatFlowBoundingSphere unex;
 #endif
 
 

=== modified file 'lib/triangulation/def_types.h'
--- lib/triangulation/def_types.h	2013-07-30 17:03:30 +0000
+++ lib/triangulation/def_types.h	2013-11-19 08:34:00 +0000
@@ -240,6 +240,10 @@
 	UnsatVertexInfo& operator= (const Vecteur &u) { Vecteur::operator= (u); return *this; }
 	UnsatVertexInfo& operator= (const float &scalar) { s=scalar; return *this; }
 	UnsatVertexInfo& operator= (const unsigned int &id) { i= id; return *this; }
+	UnsatVertexInfo (void)
+	{
+	  
+	}
 };
 
 } // namespace CGT