yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2037
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Thu 2010-02-18 23:40:58 +0100
message:
  - Comment the includes pointing to out of tree files to prevent compile errors with implicit link.
modified:
  lib/triangulation/FlowBoundingSphere.cpp
  lib/triangulation/FlowBoundingSphere.h
  lib/triangulation/TriaxialState.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 'lib/triangulation/FlowBoundingSphere.cpp'
--- lib/triangulation/FlowBoundingSphere.cpp	2010-02-17 10:59:06 +0000
+++ lib/triangulation/FlowBoundingSphere.cpp	2010-02-18 22:40:58 +0000
@@ -12,7 +12,7 @@
 #include "FlowBoundingSphere.h"//include after #define XVIEW
 
 #ifdef XVIEW
-#include "Vue3D.h"
+//#include "Vue3D.h" //FIXME implicit dependencies will look for this class (out of tree) even ifndef XVIEW
 #endif
 
 #ifdef FLOW_ENGINE

=== modified file 'lib/triangulation/FlowBoundingSphere.h'
--- lib/triangulation/FlowBoundingSphere.h	2010-02-17 10:59:06 +0000
+++ lib/triangulation/FlowBoundingSphere.h	2010-02-18 22:40:58 +0000
@@ -10,7 +10,7 @@
 #include "Empilement.h"
 
 #ifdef XVIEW
-#include "Vue3D.h"
+//#include "Vue3D.h" //FIXME implicit dependencies will look for this class (out of tree) even ifndef XVIEW
 #endif
 
 #ifdef FLOW_ENGINE

=== modified file 'lib/triangulation/TriaxialState.cpp'
--- lib/triangulation/TriaxialState.cpp	2010-02-17 10:25:54 +0000
+++ lib/triangulation/TriaxialState.cpp	2010-02-18 22:40:58 +0000
@@ -8,12 +8,6 @@
 
 #include "TriaxialState.h"
 #include <math.h>
-
-#ifdef USE_OGL_VIEW
-#include "../vueGL/vue3d.h"
-#endif
-
-
 #include<boost/iostreams/filtering_stream.hpp>
 #include<boost/iostreams/filter/bzip2.hpp>
 #include<boost/iostreams/device/file.hpp>
@@ -178,10 +172,7 @@
 		Statefile.push(boost::iostreams::file_source(string(filename)+".bz2"));}
 	else Statefile.push(boost::iostreams::file_source(string(filename)));
 	if(!Statefile.good()) {cerr << "Error opening files"; return false;}
-		
-#ifdef USE_OGL_VIEW
-	Vue3D Vue1;
-#endif
+	
 	long Idg;
 	long Ns=0;//number of spheres (excluding fictious ones))
 	Statefile >> Ng;