yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2166
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-04-20 10:55:02 +0200
message:
  Fix Jerome's problem with boost 1.35 (don't compile code uselessly)
modified:
  SConstruct
  lib/base/yadeWm3Extra_dont_include_directly.hpp
  lib/serialization/Serializable.hpp


--
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 'SConstruct'
--- SConstruct	2010-04-19 12:50:54 +0000
+++ SConstruct	2010-04-20 08:55:02 +0000
@@ -233,7 +233,7 @@
 		else: print "Nothing to clean: %s."%buildDir
 		sys.argv.remove('clean')
 	if 'tags' in sys.argv:
-		cmd="ctags -R --extra=+q --fields=+n --exclude='.*' --exclude=attic --exclude=doc --exclude=scons-local --exclude=include --exclude=debian --exclude='*.so' --langmap=c++:+.inl,c++:+.tpp,c++:+.ipp"
+		cmd="ctags -R --extra=+q --fields=+n --exclude='.*' --exclude=attic --exclude=doc --exclude=scons-local --exclude=include --exclude=debian --exclude='*.so' --exclude='*.s' --exclude='*.ii' --langmap=c++:+.inl,c++:+.tpp,c++:+.ipp"
 		print cmd; os.system(cmd)
 		sys.argv.remove('tags')
 	if 'doc' in sys.argv:

=== modified file 'lib/base/yadeWm3Extra_dont_include_directly.hpp'
--- lib/base/yadeWm3Extra_dont_include_directly.hpp	2010-03-22 12:32:38 +0000
+++ lib/base/yadeWm3Extra_dont_include_directly.hpp	2010-04-20 08:55:02 +0000
@@ -85,7 +85,7 @@
 void quaterniontoGLMatrix(const Quaternionr& q, Real m[16]);
 
 // gccxml chokes on the boost::serialization code; this part is not needed if wrapping miniWm3 anyway
-#ifndef __GCCXML__
+#if !defined(__GCCXML__) and defined(YADE_BOOST_SERIALIZATION)
 
 #include<boost/serialization/nvp.hpp>
 

=== modified file 'lib/serialization/Serializable.hpp'
--- lib/serialization/Serializable.hpp	2010-04-19 12:50:54 +0000
+++ lib/serialization/Serializable.hpp	2010-04-20 08:55:02 +0000
@@ -36,8 +36,10 @@
 
 #include<yade/lib-base/Math.hpp>
 
+#ifdef YADE_BOOST_SERIALIZATION
 // local copy
-#include<boost/introspection/has_member_function.hpp>
+	#include<boost/introspection/has_member_function.hpp>
+#endif
 
 
 using namespace boost;
@@ -298,6 +300,7 @@
 	return inst;
 }
 
+#ifdef YADE_BOOST_SERIALIZATION
 // support templates for boost::introspection::has_member_function
 // signature bool(bool) MUST match actual functions (i.e. returning bool, taking bool as parameter)
 // creates boost::introspection::has_non_const_member_function_preProcessAttributes<class>
@@ -305,6 +308,7 @@
 // inside attribute registration macros above
 BOOST_HAS_NON_CONST_MEMBER_FUNCTION(preProcessAttributes,bool(bool))
 BOOST_HAS_NON_CONST_MEMBER_FUNCTION(postProcessAttributes,bool(bool))
+#endif
 
 class Serializable : public Factorable
 {