From 928ced256a4976a766ff190aeb031b1334d7c6f4 Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Sun, 9 Oct 2016 22:14:42 +0900 Subject: [PATCH] Adjust directory structure. --- .gitignore | 18 ------------ Jamroot | 29 ------------------- README.md | 27 ----------------- .../boost}/fusion/adapted/std_array.hpp | 0 .../adapted/std_array/detail/array_size.hpp | 0 .../adapted/std_array/detail/at_impl.hpp | 0 .../adapted/std_array/detail/begin_impl.hpp | 0 .../std_array/detail/category_of_impl.hpp | 0 .../adapted/std_array/detail/end_impl.hpp | 0 .../std_array/detail/is_sequence_impl.hpp | 0 .../adapted/std_array/detail/is_view_impl.hpp | 0 .../adapted/std_array/detail/size_impl.hpp | 0 .../std_array/detail/value_at_impl.hpp | 0 .../adapted/std_array/std_array_iterator.hpp | 0 .../fusion/adapted/std_array/tag_of.hpp | 0 libs/fusion/test/sequence/CMakeLists.txt | 23 --------------- {libs/fusion/test => test}/Jamfile | 0 .../test => test}/sequence/std_array.cpp | 0 18 files changed, 97 deletions(-) delete mode 100644 .gitignore delete mode 100644 Jamroot delete mode 100644 README.md rename {boost => include/boost}/fusion/adapted/std_array.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/detail/array_size.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/detail/at_impl.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/detail/begin_impl.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/detail/category_of_impl.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/detail/end_impl.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/detail/is_sequence_impl.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/detail/is_view_impl.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/detail/size_impl.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/detail/value_at_impl.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/std_array_iterator.hpp (100%) rename {boost => include/boost}/fusion/adapted/std_array/tag_of.hpp (100%) delete mode 100644 libs/fusion/test/sequence/CMakeLists.txt rename {libs/fusion/test => test}/Jamfile (100%) rename {libs/fusion/test => test}/sequence/std_array.cpp (100%) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2e29b503..00000000 --- a/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# Compiled Object files -*.slo -*.lo -*.o - -# Compiled Dynamic libraries -*.so -*.dylib - -# Compiled Static libraries -*.lai -*.la -*.a - -# Build directories -bin -_build* -build* diff --git a/Jamroot b/Jamroot deleted file mode 100644 index ff508215..00000000 --- a/Jamroot +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (C) 2013 Mateusz Loskot -# -# 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) -# -import os ; - -local BOOST_ROOT = [ os.environ BOOST_ROOT ] ; -if $(BOOST_ROOT) -{ - use-project /boost : $(BOOST_ROOT) ; -} - -# Declare project -project boost_fusion_std_array - : - requirements - . - clang:-std=c++11 - gcc:-std=c++0x - gcc:multi - gcc:-ftemplate-depth=300 - msvc:/wd4996 - /boost//headers - ; - -build-project libs/fusion/test ; diff --git a/README.md b/README.md deleted file mode 100644 index e8719c37..00000000 --- a/README.md +++ /dev/null @@ -1,27 +0,0 @@ -Boost.Fusion extension for std::array -===================================== - -An attempt to adapt ```std::array``` for Boost.Fusion. - -The implementation is functional and passes the same test as adapted Boost.Array. - -Proposal thread on the Boost mailing list: -[[fusion] Adapter for std::array](http://lists.boost.org/Archives/boost/2013/07/205045.php). - -However, there is a problem with ADL and range-based access to the sequence -which is a well-known issue: - -* [Fusion begin/end ADL issues with C++0x range-based for](http://lists.boost.org/Archives/boost/2010/12/index.php) -* Boost ticket: [fusion::begin and fusion::end lead to problems with ADL-based begin and end functions for ranges](https://svn.boost.org/trac/boost/ticket/4028) -* Boost ticket: [Treat std::array as a Fusion sequence](https://svn.boost.org/trac/boost/ticket/8241) - -See also: - -* N3257=11-0027 Jonathan Wakely and Bjarne Stroustrup: -[Range-based for statements and ADL](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3257.pdf). -Option 5 was chosen for C++11. - -* [Jonathan Wakely's review](http://lists.boost.org/Archives/boost/2013/07/205064.php) of the issue regarding the Boost.Fusion adaptor for ```std::string```: - > The standard was changed to *not* use unqualified begin/end when the type has begin/end members, because -when there are multiple "greedy" overloads that can be found by ADL there is no simple way to prevent ambiguity. So I agree that your -best option might be to avoid those unqualified calls. diff --git a/boost/fusion/adapted/std_array.hpp b/include/boost/fusion/adapted/std_array.hpp similarity index 100% rename from boost/fusion/adapted/std_array.hpp rename to include/boost/fusion/adapted/std_array.hpp diff --git a/boost/fusion/adapted/std_array/detail/array_size.hpp b/include/boost/fusion/adapted/std_array/detail/array_size.hpp similarity index 100% rename from boost/fusion/adapted/std_array/detail/array_size.hpp rename to include/boost/fusion/adapted/std_array/detail/array_size.hpp diff --git a/boost/fusion/adapted/std_array/detail/at_impl.hpp b/include/boost/fusion/adapted/std_array/detail/at_impl.hpp similarity index 100% rename from boost/fusion/adapted/std_array/detail/at_impl.hpp rename to include/boost/fusion/adapted/std_array/detail/at_impl.hpp diff --git a/boost/fusion/adapted/std_array/detail/begin_impl.hpp b/include/boost/fusion/adapted/std_array/detail/begin_impl.hpp similarity index 100% rename from boost/fusion/adapted/std_array/detail/begin_impl.hpp rename to include/boost/fusion/adapted/std_array/detail/begin_impl.hpp diff --git a/boost/fusion/adapted/std_array/detail/category_of_impl.hpp b/include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp similarity index 100% rename from boost/fusion/adapted/std_array/detail/category_of_impl.hpp rename to include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp diff --git a/boost/fusion/adapted/std_array/detail/end_impl.hpp b/include/boost/fusion/adapted/std_array/detail/end_impl.hpp similarity index 100% rename from boost/fusion/adapted/std_array/detail/end_impl.hpp rename to include/boost/fusion/adapted/std_array/detail/end_impl.hpp diff --git a/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp similarity index 100% rename from boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp rename to include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp diff --git a/boost/fusion/adapted/std_array/detail/is_view_impl.hpp b/include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp similarity index 100% rename from boost/fusion/adapted/std_array/detail/is_view_impl.hpp rename to include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp diff --git a/boost/fusion/adapted/std_array/detail/size_impl.hpp b/include/boost/fusion/adapted/std_array/detail/size_impl.hpp similarity index 100% rename from boost/fusion/adapted/std_array/detail/size_impl.hpp rename to include/boost/fusion/adapted/std_array/detail/size_impl.hpp diff --git a/boost/fusion/adapted/std_array/detail/value_at_impl.hpp b/include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp similarity index 100% rename from boost/fusion/adapted/std_array/detail/value_at_impl.hpp rename to include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp diff --git a/boost/fusion/adapted/std_array/std_array_iterator.hpp b/include/boost/fusion/adapted/std_array/std_array_iterator.hpp similarity index 100% rename from boost/fusion/adapted/std_array/std_array_iterator.hpp rename to include/boost/fusion/adapted/std_array/std_array_iterator.hpp diff --git a/boost/fusion/adapted/std_array/tag_of.hpp b/include/boost/fusion/adapted/std_array/tag_of.hpp similarity index 100% rename from boost/fusion/adapted/std_array/tag_of.hpp rename to include/boost/fusion/adapted/std_array/tag_of.hpp diff --git a/libs/fusion/test/sequence/CMakeLists.txt b/libs/fusion/test/sequence/CMakeLists.txt deleted file mode 100644 index e948818c..00000000 --- a/libs/fusion/test/sequence/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -cmake_minimum_required (VERSION 2.8) -project(boost_fusion_std_array) - -if(MSVC) - list(APPEND CMAKE_CXX_FLAGS /Za) -else() -list(APPEND CMAKE_CXX_FLAGS -pedantic -Wall) -if(CMAKE_COMPILER_IS_GNUCXX) - list(APPEND CMAKE_CXX_FLAGS -std=c++0x) -elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang") - list(APPEND CMAKE_CXX_FLAGS -std=c++11) -endif() -endif() - -string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - -find_package(Boost 1.54) -if (NOT Boost_FOUND) - message(FATAL_ERROR "Cannot find Boost") -endif() -include_directories(${Boost_INCLUDE_DIRS}) - -add_executable(std_array std_array.cpp) diff --git a/libs/fusion/test/Jamfile b/test/Jamfile similarity index 100% rename from libs/fusion/test/Jamfile rename to test/Jamfile diff --git a/libs/fusion/test/sequence/std_array.cpp b/test/sequence/std_array.cpp similarity index 100% rename from libs/fusion/test/sequence/std_array.cpp rename to test/sequence/std_array.cpp