X-Git-Url: https://git.donarmstrong.com/?p=rsem.git;a=blobdiff_plain;f=boost%2Ffusion%2Fsequence%2Fcomparison%2Fless_equal.hpp;fp=boost%2Ffusion%2Fsequence%2Fcomparison%2Fless_equal.hpp;h=0e5d23a5eb2851f8d6db7b95457fc2846e4386f7;hp=518e1c0fd0a1587b74a8b8f37b8b963574fe93d6;hb=2d71eb92104693ca9baa5a2e1c23eeca776d8fd3;hpb=da57529b92adbb7ae74a89861cb39fb35ac7c62d diff --git a/boost/fusion/sequence/comparison/less_equal.hpp b/boost/fusion/sequence/comparison/less_equal.hpp index 518e1c0..0e5d23a 100644 --- a/boost/fusion/sequence/comparison/less_equal.hpp +++ b/boost/fusion/sequence/comparison/less_equal.hpp @@ -1,8 +1,8 @@ /*============================================================================= Copyright (c) 1999-2003 Jaakko Jarvi - Copyright (c) 2001-2006 Joel de Guzman + Copyright (c) 2001-2011 Joel de Guzman - Distributed under the Boost Software License, Version 1.0. (See accompanying + 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) ==============================================================================*/ #if !defined(FUSION_LESS_EQUAL_05052005_0432) @@ -11,7 +11,8 @@ #include #include #include -#include +#include +#include #if defined(FUSION_DIRECT_OPERATOR_USAGE) #include @@ -35,7 +36,7 @@ namespace boost { namespace fusion namespace operators { -#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400) +#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400) // Workaround for VC8.0 and VC7.1 template inline bool @@ -45,14 +46,14 @@ namespace boost { namespace fusion } template - inline typename disable_if, bool>::type + inline typename disable_if, bool>::type operator<=(sequence_base const& a, Seq2 const& b) { return less_equal(a.derived(), b); } template - inline typename disable_if, bool>::type + inline typename disable_if, bool>::type operator<=(Seq1 const& a, sequence_base const& b) { return less_equal(a, b.derived()); @@ -60,12 +61,12 @@ namespace boost { namespace fusion #else // Somehow VC8.0 and VC7.1 does not like this code -// but barfs somewhere else. +// but barfs somewhere else. template inline typename - enable_if< - detail::enable_comparison + boost::enable_if< + traits::enable_comparison , bool >::type operator<=(Seq1 const& a, Seq2 const& b)