[Boost-commit] svn:boost r77579 - trunk/boost/context

Subject: [Boost-commit] svn:boost r77579 - trunk/boost/context
From: oliver.kowalke_at_[hidden]
Date: 2012-03-27 02:03:05

Author: olli
Date: 2012-03-27 02:03:04 EDT (Tue, 27 Mar 2012)
New Revision: 77579
URL: http://svn.boost.org/trac/boost/changeset/77579

Log:
context: remove 'error' pre-processor macro for i386; add description

Text files modified: 
   trunk/boost/context/fcontext.hpp |     3 ++-                                     
   1 files changed, 2 insertions(+), 1 deletions(-)

Modified: trunk/boost/context/fcontext.hpp
==============================================================================
--- trunk/boost/context/fcontext.hpp	(original)
+++ trunk/boost/context/fcontext.hpp	2012-03-27 02:03:04 EDT (Tue, 27 Mar 2012)
@@ -21,6 +21,8 @@
 #endif
 
 // x86_64
+// test x86_64 before i386 because icc might
+// define __i686__ for x86_64 too
 #if defined(__x86_64__) || defined(__x86_64) \
     || defined(__amd64__) || defined(__amd64) \
     || defined(_M_X64) || defined(_M_AMD64)
@@ -38,7 +40,6 @@
 # if defined(BOOST_WINDOWS)
 #  include <boost/context/detail/fcontext_i386_win.hpp>
 # else
-# error "wrong platform"
 #  include <boost/context/detail/fcontext_i386.hpp>
 # endif
 // arm