From 09bd088660da91f2f2651588c59f46cb4597b7c1 Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Fri, 15 Oct 2010 11:40:37 +0000 Subject: [PATCH] Fusion: functional includes fixes; fixes #4729 [SVN r65974] --- .../{unfused_lvalue_args.hpp => make_unfused.hpp} | 11 ++++++----- .../boost/fusion/include/make_unfused_generic.hpp | 12 ------------ .../fusion/include/make_unfused_lvalue_args.hpp | 12 ------------ .../fusion/include/make_unfused_rvalue_args.hpp | 12 ------------ .../include/{unfused_generic.hpp => unfused.hpp} | 9 +++++---- include/boost/fusion/include/unfused_rvalue_args.hpp | 12 ------------ 6 files changed, 11 insertions(+), 57 deletions(-) rename include/boost/fusion/include/{unfused_lvalue_args.hpp => make_unfused.hpp} (58%) delete mode 100644 include/boost/fusion/include/make_unfused_generic.hpp delete mode 100644 include/boost/fusion/include/make_unfused_lvalue_args.hpp delete mode 100644 include/boost/fusion/include/make_unfused_rvalue_args.hpp rename include/boost/fusion/include/{unfused_generic.hpp => unfused.hpp} (63%) delete mode 100644 include/boost/fusion/include/unfused_rvalue_args.hpp diff --git a/include/boost/fusion/include/unfused_lvalue_args.hpp b/include/boost/fusion/include/make_unfused.hpp similarity index 58% rename from include/boost/fusion/include/unfused_lvalue_args.hpp rename to include/boost/fusion/include/make_unfused.hpp index 17acc261..ae3b6679 100644 --- a/include/boost/fusion/include/unfused_lvalue_args.hpp +++ b/include/boost/fusion/include/make_unfused.hpp @@ -1,12 +1,13 @@ -/*============================================================================= - Copyright (c) 2001-2007 Joel de Guzman +/*============================================================================== + Copyright (c) 2010 Christopher Schmidt 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_INCLUDE_UNFUSED_LVALUE_ARGS) -#define FUSION_INCLUDE_UNFUSED_LVALUE_ARGS -#include +#ifndef BOOST_FUSION_INCLUDE_MAKE_UNFUSED_HPP +#define BOOST_FUSION_INCLUDE_MAKE_UNFUSED_HPP + +#include #endif diff --git a/include/boost/fusion/include/make_unfused_generic.hpp b/include/boost/fusion/include/make_unfused_generic.hpp deleted file mode 100644 index dcebceb1..00000000 --- a/include/boost/fusion/include/make_unfused_generic.hpp +++ /dev/null @@ -1,12 +0,0 @@ -/*============================================================================= - Copyright (c) 2001-2007 Joel de Guzman - - 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_INCLUDE_MAKE_UNFUSED_GENERIC) -#define FUSION_INCLUDE_MAKE_UNFUSED_GENERIC - -#include - -#endif diff --git a/include/boost/fusion/include/make_unfused_lvalue_args.hpp b/include/boost/fusion/include/make_unfused_lvalue_args.hpp deleted file mode 100644 index 1805bb18..00000000 --- a/include/boost/fusion/include/make_unfused_lvalue_args.hpp +++ /dev/null @@ -1,12 +0,0 @@ -/*============================================================================= - Copyright (c) 2001-2007 Joel de Guzman - - 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_INCLUDE_MAKE_UNFUSED_LVALUE_ARGS) -#define FUSION_INCLUDE_MAKE_UNFUSED_LVALUE_ARGS - -#include - -#endif diff --git a/include/boost/fusion/include/make_unfused_rvalue_args.hpp b/include/boost/fusion/include/make_unfused_rvalue_args.hpp deleted file mode 100644 index 0d546be7..00000000 --- a/include/boost/fusion/include/make_unfused_rvalue_args.hpp +++ /dev/null @@ -1,12 +0,0 @@ -/*============================================================================= - Copyright (c) 2001-2007 Joel de Guzman - - 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_INCLUDE_MAKE_UNFUSED_RVALUE_ARGS) -#define FUSION_INCLUDE_MAKE_UNFUSED_RVALUE_ARGS - -#include - -#endif diff --git a/include/boost/fusion/include/unfused_generic.hpp b/include/boost/fusion/include/unfused.hpp similarity index 63% rename from include/boost/fusion/include/unfused_generic.hpp rename to include/boost/fusion/include/unfused.hpp index d377900f..e386ce5a 100644 --- a/include/boost/fusion/include/unfused_generic.hpp +++ b/include/boost/fusion/include/unfused.hpp @@ -1,12 +1,13 @@ /*============================================================================= - Copyright (c) 2001-2007 Joel de Guzman + Copyright (c) 2010 Christopher Schmidt 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_INCLUDE_UNFUSED_GENERIC) -#define FUSION_INCLUDE_UNFUSED_GENERIC -#include +#ifndef BOOST_FUSION_INCLUDE_UNFUSED_HPP +#define BOOST_FUSION_INCLUDE_UNFUSED_HPP + +#include #endif diff --git a/include/boost/fusion/include/unfused_rvalue_args.hpp b/include/boost/fusion/include/unfused_rvalue_args.hpp deleted file mode 100644 index 556b2dee..00000000 --- a/include/boost/fusion/include/unfused_rvalue_args.hpp +++ /dev/null @@ -1,12 +0,0 @@ -/*============================================================================= - Copyright (c) 2001-2007 Joel de Guzman - - 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_INCLUDE_UNFUSED_RVALUE_ARGS) -#define FUSION_INCLUDE_UNFUSED_RVALUE_ARGS - -#include - -#endif