yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2355
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-07-12 19:44:48 +0200
message:
  1. Fix compilation error due to free-standing function out (remember: NO FREE FUNCTIONS, everything must be inside classes, otherwise there is the risk of name clashes.)
modified:
  pkg/common/DataClass/Shape/Cylinder.cpp
  pkg/common/DataClass/Shape/Cylinder.hpp
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'pkg/common/DataClass/Shape/Cylinder.cpp'
--- pkg/common/DataClass/Shape/Cylinder.cpp	2010-07-12 17:36:42 +0000
+++ pkg/common/DataClass/Shape/Cylinder.cpp	2010-07-12 17:44:48 +0000
@@ -179,7 +179,7 @@
 // int  Gl1_ChainedCylinder::glutStacks;
 // int Gl1_ChainedCylinder::glCylinderList=-1;
 
-void out ( Quaternionr q )
+void Gl1_Cylinder::out( Quaternionr q )
 {
 	AngleAxisr aa(q);
 	std::cout << " axis: " <<  aa.axis()[0] << " " << aa.axis()[1] << " " << aa.axis()[2] << ", angle: " << aa.angle() << " | ";

=== modified file 'pkg/common/DataClass/Shape/Cylinder.hpp'
--- pkg/common/DataClass/Shape/Cylinder.hpp	2010-07-12 17:36:42 +0000
+++ pkg/common/DataClass/Shape/Cylinder.hpp	2010-07-12 17:44:48 +0000
@@ -128,6 +128,7 @@
 		void initGlLists(void);
 	public:
 		virtual void go(const shared_ptr<Shape>&, const shared_ptr<State>&,bool,const GLViewInfo&);
+		void out( Quaternionr q );
 	YADE_CLASS_BASE_DOC_STATICATTRS(Gl1_Cylinder,GlShapeFunctor,"Renders :yref:`Cylinder` object",
 		((bool,wire,false,"Only show wireframe (controlled by ``glutSlices`` and ``glutStacks``."))
 		((bool,glutNormalize,true,"Fix normals for non-wire rendering"))

=== modified file 'pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp'
--- pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp	2010-07-12 08:50:35 +0000
+++ pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp	2010-07-12 17:44:48 +0000
@@ -19,17 +19,6 @@
 
 Vector3r translation_vect_ ( 0.10,0,0 );
 
-void out ( Quaternionr q )
-{
-	AngleAxisr aa(q);
-	std::cout << " axis: " <<  aa.axis()[0] << " " << aa.axis()[1] << " " << aa.axis()[2] << ", angle: " << aa.angle() << " | ";
-}
-
-void outv ( Vector3r axis )
-{
-	std::cout << " axis: " <<  axis[0] << " " << axis[1] << " " << axis[2] << ", length: " << axis.norm() << " | ";
-}
-
 
 
 void CohesiveFrictionalContactLaw::action()