diff -r -u boost_1_47_0.orig/boost/asio/detail/fenced_block.hpp boost_1_47_0/boost/asio/detail/fenced_block.hpp --- boost_1_47_0.orig/boost/asio/detail/fenced_block.hpp 2011-08-07 19:55:19.000000000 +0600 +++ boost_1_47_0/boost/asio/detail/fenced_block.hpp 2011-08-07 21:05:27.000000000 +0600 @@ -30,9 +30,10 @@ #elif defined(__GNUC__) && (defined(__hppa) || defined(__hppa__)) # include #elif defined(__GNUC__) \ - && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \ - && !defined(__INTEL_COMPILER) && !defined(__ICL) \ - && !defined(__ICC) && !defined(__ECC) && !defined(__PATHSCALE__) + && ((((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \ + && !defined(__INTEL_COMPILER) && !defined(__ICC)) \ + || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1100)) \ + && !defined(__ICL) && !defined(__ECC) && !defined(__PATHSCALE__) # include #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) # include @@ -59,9 +60,10 @@ #elif defined(__GNUC__) && (defined(__hppa) || defined(__hppa__)) typedef gcc_hppa_fenced_block fenced_block; #elif defined(__GNUC__) \ - && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \ - && !defined(__INTEL_COMPILER) && !defined(__ICL) \ - && !defined(__ICC) && !defined(__ECC) && !defined(__PATHSCALE__) + && ((((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \ + && !defined(__INTEL_COMPILER) && !defined(__ICC)) \ + || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1100)) \ + && !defined(__ICL) && !defined(__ECC) && !defined(__PATHSCALE__) typedef gcc_sync_fenced_block fenced_block; #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) typedef gcc_x86_fenced_block fenced_block; diff -r -u boost_1_47_0.orig/boost/asio/detail/gcc_sync_fenced_block.hpp boost_1_47_0/boost/asio/detail/gcc_sync_fenced_block.hpp --- boost_1_47_0.orig/boost/asio/detail/gcc_sync_fenced_block.hpp 2011-08-07 19:55:19.000000000 +0600 +++ boost_1_47_0/boost/asio/detail/gcc_sync_fenced_block.hpp 2011-08-07 21:05:31.000000000 +0600 @@ -18,9 +18,10 @@ #include #if defined(__GNUC__) \ - && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \ - && !defined(__INTEL_COMPILER) && !defined(__ICL) \ - && !defined(__ICC) && !defined(__ECC) && !defined(__PATHSCALE__) + && ((((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \ + && !defined(__INTEL_COMPILER) && !defined(__ICC)) \ + || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1100)) \ + && !defined(__ICL) && !defined(__ECC) && !defined(__PATHSCALE__) #include