From 13b330fa4115c39674e7c29b034febee0e87ea6e Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Tue, 8 Jul 2014 10:13:02 -0400 Subject: [PATCH] Move mpl and fusion from ext/ to ext/boost/ --- benchmark/foldable/foldl/fusion_cons.cpp | 2 +- benchmark/foldable/foldl/fusion_list.cpp | 2 +- benchmark/foldable/foldl/fusion_vector.cpp | 2 +- benchmark/functor/fmap/mpl_list.cpp | 2 +- benchmark/functor/fmap/mpl_vector.cpp | 2 +- include/boost/hana/ext/{ => boost}/fusion.hpp | 6 +++--- include/boost/hana/ext/{ => boost}/mpl/list.hpp | 6 +++--- include/boost/hana/ext/{ => boost}/mpl/vector.hpp | 6 +++--- test/ext/{ => boost}/fusion/datatype.cpp | 2 +- test/ext/{ => boost}/fusion/helper.hpp | 6 +++--- test/ext/{ => boost}/fusion/iterable/head.cpp | 2 +- test/ext/{ => boost}/fusion/iterable/is_empty.cpp | 2 +- test/ext/{ => boost}/fusion/iterable/tail.cpp | 2 +- test/ext/{ => boost}/fusion/list/cons.cpp | 2 +- test/ext/{ => boost}/fusion/list/nil.cpp | 2 +- test/ext/{ => boost}/mpl/list/comparable/equal.cpp | 2 +- test/ext/{ => boost}/mpl/list/datatype.cpp | 2 +- test/ext/{ => boost}/mpl/list/functor/fmap.cpp | 2 +- test/ext/{ => boost}/mpl/list/functor/laws.cpp | 2 +- test/ext/{ => boost}/mpl/vector/comparable/equal.cpp | 2 +- test/ext/{ => boost}/mpl/vector/datatype.cpp | 2 +- test/ext/{ => boost}/mpl/vector/functor/fmap.cpp | 2 +- test/ext/{ => boost}/mpl/vector/functor/laws.cpp | 2 +- 23 files changed, 31 insertions(+), 31 deletions(-) rename include/boost/hana/ext/{ => boost}/fusion.hpp (95%) rename include/boost/hana/ext/{ => boost}/mpl/list.hpp (92%) rename include/boost/hana/ext/{ => boost}/mpl/vector.hpp (91%) rename test/ext/{ => boost}/fusion/datatype.cpp (96%) rename test/ext/{ => boost}/fusion/helper.hpp (86%) rename test/ext/{ => boost}/fusion/iterable/head.cpp (91%) rename test/ext/{ => boost}/fusion/iterable/is_empty.cpp (92%) rename test/ext/{ => boost}/fusion/iterable/tail.cpp (92%) rename test/ext/{ => boost}/fusion/list/cons.cpp (92%) rename test/ext/{ => boost}/fusion/list/nil.cpp (90%) rename test/ext/{ => boost}/mpl/list/comparable/equal.cpp (95%) rename test/ext/{ => boost}/mpl/list/datatype.cpp (96%) rename test/ext/{ => boost}/mpl/list/functor/fmap.cpp (94%) rename test/ext/{ => boost}/mpl/list/functor/laws.cpp (95%) rename test/ext/{ => boost}/mpl/vector/comparable/equal.cpp (94%) rename test/ext/{ => boost}/mpl/vector/datatype.cpp (95%) rename test/ext/{ => boost}/mpl/vector/functor/fmap.cpp (94%) rename test/ext/{ => boost}/mpl/vector/functor/laws.cpp (95%) diff --git a/benchmark/foldable/foldl/fusion_cons.cpp b/benchmark/foldable/foldl/fusion_cons.cpp index 9f2342c46..d0f823846 100644 --- a/benchmark/foldable/foldl/fusion_cons.cpp +++ b/benchmark/foldable/foldl/fusion_cons.cpp @@ -1,7 +1,7 @@ <% cons = Benchcc::Fusion::Cons.new((0..x).map { |i| "x<#{i}>" }) %> <%= cons.includes %> -#include +#include template diff --git a/benchmark/foldable/foldl/fusion_list.cpp b/benchmark/foldable/foldl/fusion_list.cpp index d9659a0e4..7bedfc22a 100644 --- a/benchmark/foldable/foldl/fusion_list.cpp +++ b/benchmark/foldable/foldl/fusion_list.cpp @@ -1,7 +1,7 @@ <% list = Benchcc::Fusion::List.new((0..x).map { |i| "x<#{i}>" }) %> <%= list.includes %> -#include +#include template diff --git a/benchmark/foldable/foldl/fusion_vector.cpp b/benchmark/foldable/foldl/fusion_vector.cpp index 4b4e88ef7..62dc208de 100644 --- a/benchmark/foldable/foldl/fusion_vector.cpp +++ b/benchmark/foldable/foldl/fusion_vector.cpp @@ -1,7 +1,7 @@ <% vector = Benchcc::Fusion::Vector.new((0..x).map { |i| "x<#{i}>" }) %> <%= vector.includes %> -#include +#include template diff --git a/benchmark/functor/fmap/mpl_list.cpp b/benchmark/functor/fmap/mpl_list.cpp index 212705b00..090b600a7 100644 --- a/benchmark/functor/fmap/mpl_list.cpp +++ b/benchmark/functor/fmap/mpl_list.cpp @@ -1,4 +1,4 @@ -#include +#include #include <% list = Benchcc::MPL::List.new((0...x).map { |i| "x<#{i}>" }) %> diff --git a/benchmark/functor/fmap/mpl_vector.cpp b/benchmark/functor/fmap/mpl_vector.cpp index e7deff69a..9744bd733 100644 --- a/benchmark/functor/fmap/mpl_vector.cpp +++ b/benchmark/functor/fmap/mpl_vector.cpp @@ -1,4 +1,4 @@ -#include +#include #include <% vector = Benchcc::MPL::Vector.new((0...x).map { |i| "x<#{i}>" }) %> diff --git a/include/boost/hana/ext/fusion.hpp b/include/boost/hana/ext/boost/fusion.hpp similarity index 95% rename from include/boost/hana/ext/fusion.hpp rename to include/boost/hana/ext/boost/fusion.hpp index ce2f0ce60..469a21039 100644 --- a/include/boost/hana/ext/fusion.hpp +++ b/include/boost/hana/ext/boost/fusion.hpp @@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#ifndef BOOST_HANA_EXT_FUSION_VECTOR_HPP -#define BOOST_HANA_EXT_FUSION_VECTOR_HPP +#ifndef BOOST_HANA_EXT_BOOST_FUSION_VECTOR_HPP +#define BOOST_HANA_EXT_BOOST_FUSION_VECTOR_HPP #include #include @@ -88,4 +88,4 @@ namespace boost { namespace hana { }; }} // end namespace boost::hana -#endif // !BOOST_HANA_EXT_FUSION_VECTOR_HPP +#endif // !BOOST_HANA_EXT_BOOST_FUSION_VECTOR_HPP diff --git a/include/boost/hana/ext/mpl/list.hpp b/include/boost/hana/ext/boost/mpl/list.hpp similarity index 92% rename from include/boost/hana/ext/mpl/list.hpp rename to include/boost/hana/ext/boost/mpl/list.hpp index 3d99a54da..a2ed2e913 100644 --- a/include/boost/hana/ext/mpl/list.hpp +++ b/include/boost/hana/ext/boost/mpl/list.hpp @@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#ifndef BOOST_HANA_EXT_MPL_LIST_HPP -#define BOOST_HANA_EXT_MPL_LIST_HPP +#ifndef BOOST_HANA_EXT_BOOST_MPL_LIST_HPP +#define BOOST_HANA_EXT_BOOST_MPL_LIST_HPP #include #include @@ -56,4 +56,4 @@ namespace boost { namespace hana { }; }} // end namespace boost::hana -#endif // !BOOST_HANA_EXT_MPL_LIST_HPP +#endif // !BOOST_HANA_EXT_BOOST_MPL_LIST_HPP diff --git a/include/boost/hana/ext/mpl/vector.hpp b/include/boost/hana/ext/boost/mpl/vector.hpp similarity index 91% rename from include/boost/hana/ext/mpl/vector.hpp rename to include/boost/hana/ext/boost/mpl/vector.hpp index 46b568833..e96c1b934 100644 --- a/include/boost/hana/ext/mpl/vector.hpp +++ b/include/boost/hana/ext/boost/mpl/vector.hpp @@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#ifndef BOOST_HANA_EXT_MPL_VECTOR_HPP -#define BOOST_HANA_EXT_MPL_VECTOR_HPP +#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_HPP +#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_HPP #include #include @@ -56,4 +56,4 @@ namespace boost { namespace hana { }; }} // end namespace boost::hana -#endif // !BOOST_HANA_EXT_MPL_VECTOR_HPP +#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_HPP diff --git a/test/ext/fusion/datatype.cpp b/test/ext/boost/fusion/datatype.cpp similarity index 96% rename from test/ext/fusion/datatype.cpp rename to test/ext/boost/fusion/datatype.cpp index ecbfd17a9..4e0dd952f 100644 --- a/test/ext/fusion/datatype.cpp +++ b/test/ext/boost/fusion/datatype.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include diff --git a/test/ext/fusion/helper.hpp b/test/ext/boost/fusion/helper.hpp similarity index 86% rename from test/ext/fusion/helper.hpp rename to test/ext/boost/fusion/helper.hpp index 3b6396d7d..e2a663202 100644 --- a/test/ext/fusion/helper.hpp +++ b/test/ext/boost/fusion/helper.hpp @@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#ifndef BOOST_HANA_TEST_EXT_FUSION_HELPER_HPP -#define BOOST_HANA_TEST_EXT_FUSION_HELPER_HPP +#ifndef BOOST_HANA_TEST_EXT_BOOST_FUSION_HELPER_HPP +#define BOOST_HANA_TEST_EXT_BOOST_FUSION_HELPER_HPP #include @@ -29,4 +29,4 @@ auto with_nonassociative_forward_sequences = [](auto test) { }); }; -#endif // !BOOST_HANA_TEST_EXT_FUSION_HELPER_HPP +#endif // !BOOST_HANA_TEST_EXT_BOOST_FUSION_HELPER_HPP diff --git a/test/ext/fusion/iterable/head.cpp b/test/ext/boost/fusion/iterable/head.cpp similarity index 91% rename from test/ext/fusion/iterable/head.cpp rename to test/ext/boost/fusion/iterable/head.cpp index 0ae36dac2..556657b20 100644 --- a/test/ext/fusion/iterable/head.cpp +++ b/test/ext/boost/fusion/iterable/head.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include "../helper.hpp" #include diff --git a/test/ext/fusion/iterable/is_empty.cpp b/test/ext/boost/fusion/iterable/is_empty.cpp similarity index 92% rename from test/ext/fusion/iterable/is_empty.cpp rename to test/ext/boost/fusion/iterable/is_empty.cpp index f9f93da45..d385e363b 100644 --- a/test/ext/fusion/iterable/is_empty.cpp +++ b/test/ext/boost/fusion/iterable/is_empty.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include "../helper.hpp" #include diff --git a/test/ext/fusion/iterable/tail.cpp b/test/ext/boost/fusion/iterable/tail.cpp similarity index 92% rename from test/ext/fusion/iterable/tail.cpp rename to test/ext/boost/fusion/iterable/tail.cpp index a2022d757..0cf8e7ada 100644 --- a/test/ext/fusion/iterable/tail.cpp +++ b/test/ext/boost/fusion/iterable/tail.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include "../helper.hpp" #include diff --git a/test/ext/fusion/list/cons.cpp b/test/ext/boost/fusion/list/cons.cpp similarity index 92% rename from test/ext/fusion/list/cons.cpp rename to test/ext/boost/fusion/list/cons.cpp index 55e3d8563..4ff10ce58 100644 --- a/test/ext/fusion/list/cons.cpp +++ b/test/ext/boost/fusion/list/cons.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include "../helper.hpp" #include diff --git a/test/ext/fusion/list/nil.cpp b/test/ext/boost/fusion/list/nil.cpp similarity index 90% rename from test/ext/fusion/list/nil.cpp rename to test/ext/boost/fusion/list/nil.cpp index 037784582..403b43d6a 100644 --- a/test/ext/fusion/list/nil.cpp +++ b/test/ext/boost/fusion/list/nil.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include "../helper.hpp" #include diff --git a/test/ext/mpl/list/comparable/equal.cpp b/test/ext/boost/mpl/list/comparable/equal.cpp similarity index 95% rename from test/ext/mpl/list/comparable/equal.cpp rename to test/ext/boost/mpl/list/comparable/equal.cpp index 1008da6a7..1eabf91aa 100644 --- a/test/ext/mpl/list/comparable/equal.cpp +++ b/test/ext/boost/mpl/list/comparable/equal.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include diff --git a/test/ext/mpl/list/datatype.cpp b/test/ext/boost/mpl/list/datatype.cpp similarity index 96% rename from test/ext/mpl/list/datatype.cpp rename to test/ext/boost/mpl/list/datatype.cpp index 37e480918..0ed05cdb0 100644 --- a/test/ext/mpl/list/datatype.cpp +++ b/test/ext/boost/mpl/list/datatype.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include diff --git a/test/ext/mpl/list/functor/fmap.cpp b/test/ext/boost/mpl/list/functor/fmap.cpp similarity index 94% rename from test/ext/mpl/list/functor/fmap.cpp rename to test/ext/boost/mpl/list/functor/fmap.cpp index b11c8ebf3..2938d35f7 100644 --- a/test/ext/mpl/list/functor/fmap.cpp +++ b/test/ext/boost/mpl/list/functor/fmap.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include #include diff --git a/test/ext/mpl/list/functor/laws.cpp b/test/ext/boost/mpl/list/functor/laws.cpp similarity index 95% rename from test/ext/mpl/list/functor/laws.cpp rename to test/ext/boost/mpl/list/functor/laws.cpp index 567c2c1e6..18c31d3f4 100644 --- a/test/ext/mpl/list/functor/laws.cpp +++ b/test/ext/boost/mpl/list/functor/laws.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include #include diff --git a/test/ext/mpl/vector/comparable/equal.cpp b/test/ext/boost/mpl/vector/comparable/equal.cpp similarity index 94% rename from test/ext/mpl/vector/comparable/equal.cpp rename to test/ext/boost/mpl/vector/comparable/equal.cpp index 0bf4722e8..770b838b1 100644 --- a/test/ext/mpl/vector/comparable/equal.cpp +++ b/test/ext/boost/mpl/vector/comparable/equal.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include diff --git a/test/ext/mpl/vector/datatype.cpp b/test/ext/boost/mpl/vector/datatype.cpp similarity index 95% rename from test/ext/mpl/vector/datatype.cpp rename to test/ext/boost/mpl/vector/datatype.cpp index 96ba52920..0f00156b2 100644 --- a/test/ext/mpl/vector/datatype.cpp +++ b/test/ext/boost/mpl/vector/datatype.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include diff --git a/test/ext/mpl/vector/functor/fmap.cpp b/test/ext/boost/mpl/vector/functor/fmap.cpp similarity index 94% rename from test/ext/mpl/vector/functor/fmap.cpp rename to test/ext/boost/mpl/vector/functor/fmap.cpp index 86b03e890..7c9a11b8d 100644 --- a/test/ext/mpl/vector/functor/fmap.cpp +++ b/test/ext/boost/mpl/vector/functor/fmap.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include #include diff --git a/test/ext/mpl/vector/functor/laws.cpp b/test/ext/boost/mpl/vector/functor/laws.cpp similarity index 95% rename from test/ext/mpl/vector/functor/laws.cpp rename to test/ext/boost/mpl/vector/functor/laws.cpp index fe70947f6..88a1bb062 100644 --- a/test/ext/mpl/vector/functor/laws.cpp +++ b/test/ext/boost/mpl/vector/functor/laws.cpp @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ -#include +#include #include #include