yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4071
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Fri 2014-07-11 20:27:33 +0200
message:
  Move definitions of YADE_PTR_CAST YADE_CAST YADE_PTR_DYN_CAST into
  Math.hpp
modified:
  CMakeLists.txt
  lib/base/Math.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 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-11 17:39:21 +0000
+++ CMakeLists.txt	2014-07-11 18:27:33 +0000
@@ -63,7 +63,7 @@
 
 #===========================================================
 
-ADD_DEFINITIONS(" -DYADE_PTR_CAST=boost::static_pointer_cast -DYADE_CAST=static_cast -DYADE_PTR_DYN_CAST=boost::dynamic_pointer_cast -std=c++0x")
+ADD_DEFINITIONS("-std=c++0x")
 
 #===========================================================
 

=== modified file 'lib/base/Math.hpp'
--- lib/base/Math.hpp	2014-07-04 17:46:32 +0000
+++ lib/base/Math.hpp	2014-07-11 18:27:33 +0000
@@ -70,6 +70,18 @@
 	#define FOREACH BOOST_FOREACH
 #endif
 
+#ifndef YADE_PTR_CAST
+	#define YADE_PTR_CAST boost::static_pointer_cast
+#endif
+
+#ifndef YADE_CAST
+	#define YADE_CAST static_cast
+#endif
+
+#ifndef YADE_PTR_DYN_CAST
+	#define YADE_PTR_DYN_CAST boost::dynamic_pointer_cast
+#endif
+
 #define EIGEN_DONT_PARALLELIZE
 
 #ifdef YADE_MASK_ARBITRARY