]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Incorporate the fix from http://thread.gmane.org/gmane.comp.lib.boost.devel/176050...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 21 Sep 2008 21:33:54 +0000 (21:33 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 21 Sep 2008 21:33:54 +0000 (21:33 +0000)
git-svn-id: https://svn.dealii.org/trunk@16885 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/boost/include/boost/detail/spinlock.hpp

index e2736470631e9450cbf9652da14ecac4cb26e3b4..60bdeeb699fc2e725d51b078fd602f74b6e16710 100644 (file)
@@ -32,7 +32,8 @@
 
 #if defined(__GNUC__) && defined( __arm__ )
 #  include <boost/detail/spinlock_gcc_arm.hpp>
-#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) \
+   && ( !defined(__INTEL_COMPILER) || defined(__ia64) )
 #  include <boost/detail/spinlock_sync.hpp>
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #  include <boost/detail/spinlock_w32.hpp>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.