[Boost-commit] svn:boost r78157 - in branches/release: . boost boost/spirit boost/spirit/home boost/spirit/home/support/detail

Subject: [Boost-commit] svn:boost r78157 - in branches/release: . boost boost/spirit boost/spirit/home boost/spirit/home/support/detail
From: hartmut.kaiser_at_[hidden]
Date: 2012-04-23 08:11:18

Author: hkaiser
Date: 2012-04-23 08:11:17 EDT (Mon, 23 Apr 2012)
New Revision: 78157
URL: http://svn.boost.org/trac/boost/changeset/78157

Log:
Merging from trunk
Fixed #6179: spirit fatal error: 'boost/endian/integers.hpp' file not found
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/spirit/   (props changed)
   branches/release/boost/spirit/home/   (props changed)
Text files modified: 
   branches/release/boost/spirit/home/support/detail/endian.hpp |    12 ++++++------                            
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: branches/release/boost/spirit/home/support/detail/endian.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/detail/endian.hpp	(original)
+++ branches/release/boost/spirit/home/support/detail/endian.hpp	2012-04-23 08:11:17 EDT (Mon, 23 Apr 2012)
@@ -1,6 +1,6 @@
 //  Copyright (c) 2001-2011 Hartmut Kaiser
 //  http://spirit.sourceforge.net/
-// 
+//
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -18,12 +18,12 @@
 #define BOOST_ENDIAN_FORCE_PODNESS 1
 #endif
 
-// If Boost has the endian library, use it, otherwise use an adapted version 
+// If Boost has the endian library, use it, otherwise use an adapted version
 // included with Spirit
-#if BOOST_VERSION >= 105000
-#include <boost/endian/integers.hpp>
-#else
+// #if BOOST_VERSION >= 105100
+// #include <boost/endian/integers.hpp>
+// #else
 #include <boost/spirit/home/support/detail/endian/endian.hpp>
-#endif
+// #endif
 
 #endif