From 2575467a402f075a443a5449d1d8131c2e75aeee Mon Sep 17 00:00:00 2001 From: Zach Laine Date: Mon, 24 Sep 2018 06:48:48 -0500 Subject: [PATCH] Move all headers under include/boost/. --- CMakeLists.txt | 8 ++++---- {yaml => include/boost/yaml}/ast.hpp | 2 +- {yaml => include/boost/yaml}/config.hpp | 0 {yaml => include/boost/yaml}/detail/ast_impl.hpp | 2 +- {yaml => include/boost/yaml}/parser/basic_structures.hpp | 6 +++--- .../boost/yaml}/parser/basic_structures_def.hpp | 2 +- {yaml => include/boost/yaml}/parser/block_styles.hpp | 6 +++--- {yaml => include/boost/yaml}/parser/block_styles_def.hpp | 2 +- {yaml => include/boost/yaml}/parser/characters.hpp | 4 ++-- {yaml => include/boost/yaml}/parser/characters_def.hpp | 2 +- {yaml => include/boost/yaml}/parser/error_handler.hpp | 2 +- {yaml => include/boost/yaml}/parser/flow_styles.hpp | 6 +++--- {yaml => include/boost/yaml}/parser/flow_styles_def.hpp | 2 +- {yaml => include/boost/yaml}/parser/parser_fwd.hpp | 6 +++--- {yaml => include/boost/yaml}/parser/stream.hpp | 6 +++--- {yaml => include/boost/yaml}/parser/stream_def.hpp | 2 +- perf/make_parser_perf_test.py | 2 +- perf/parse_perf.cpp | 2 +- src/basic_structures.cpp | 2 +- src/block_style.cpp | 2 +- src/characters.cpp | 2 +- src/flow_style.cpp | 2 +- src/stream.cpp | 2 +- test/parse_yaml_compare_test.cpp | 2 +- test/parse_yaml_round_trip_test.cpp | 2 +- test/parse_yaml_test.cpp | 2 +- test/warnings_test.cpp | 2 +- 27 files changed, 40 insertions(+), 40 deletions(-) rename {yaml => include/boost/yaml}/ast.hpp (99%) rename {yaml => include/boost/yaml}/config.hpp (100%) rename {yaml => include/boost/yaml}/detail/ast_impl.hpp (99%) rename {yaml => include/boost/yaml}/parser/basic_structures.hpp (94%) rename {yaml => include/boost/yaml}/parser/basic_structures_def.hpp (99%) rename {yaml => include/boost/yaml}/parser/block_styles.hpp (96%) rename {yaml => include/boost/yaml}/parser/block_styles_def.hpp (99%) rename {yaml => include/boost/yaml}/parser/characters.hpp (90%) rename {yaml => include/boost/yaml}/parser/characters_def.hpp (99%) rename {yaml => include/boost/yaml}/parser/error_handler.hpp (99%) rename {yaml => include/boost/yaml}/parser/flow_styles.hpp (97%) rename {yaml => include/boost/yaml}/parser/flow_styles_def.hpp (99%) rename {yaml => include/boost/yaml}/parser/parser_fwd.hpp (98%) rename {yaml => include/boost/yaml}/parser/stream.hpp (95%) rename {yaml => include/boost/yaml}/parser/stream_def.hpp (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e21fced9..551d8866 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,8 +58,8 @@ add_library( src/block_style.cpp src/stream.cpp ) -target_compile_options(yaml-static PUBLIC ${cxx_defs}) -target_include_directories(yaml-static PUBLIC ${CMAKE_SOURCE_DIR}) +target_compile_options(yaml-static PUBLIC ${cxx_defs}) +target_include_directories(yaml-static PUBLIC ${CMAKE_SOURCE_DIR}/include) target_link_libraries(yaml-static PUBLIC boost) target_link_libraries(yaml-static ${link_flags}) if (USE_ASAN OR USE_UBSAN) @@ -83,8 +83,8 @@ add_library( src/block_style.cpp src/stream.cpp ) -target_compile_options(yaml PUBLIC ${cxx_defs}) -target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}) +target_compile_options(yaml PUBLIC ${cxx_defs}) +target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/include) target_link_libraries(yaml PUBLIC boost) target_link_libraries(yaml ${link_flags}) if (USE_ASAN OR USE_UBSAN) diff --git a/yaml/ast.hpp b/include/boost/yaml/ast.hpp similarity index 99% rename from yaml/ast.hpp rename to include/boost/yaml/ast.hpp index 72fc2c2e..2882f5e6 100644 --- a/yaml/ast.hpp +++ b/include/boost/yaml/ast.hpp @@ -175,6 +175,6 @@ namespace boost { namespace yaml { namespace ast { }}} -#include +#include #endif diff --git a/yaml/config.hpp b/include/boost/yaml/config.hpp similarity index 100% rename from yaml/config.hpp rename to include/boost/yaml/config.hpp diff --git a/yaml/detail/ast_impl.hpp b/include/boost/yaml/detail/ast_impl.hpp similarity index 99% rename from yaml/detail/ast_impl.hpp rename to include/boost/yaml/detail/ast_impl.hpp index 6a267a1f..9b00401e 100644 --- a/yaml/detail/ast_impl.hpp +++ b/include/boost/yaml/detail/ast_impl.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_AST_VALUE_IMPL_HPP #define BOOST_AST_VALUE_IMPL_HPP -#include +#include #include #include diff --git a/yaml/parser/basic_structures.hpp b/include/boost/yaml/parser/basic_structures.hpp similarity index 94% rename from yaml/parser/basic_structures.hpp rename to include/boost/yaml/parser/basic_structures.hpp index e656ba3b..4ed69dbb 100644 --- a/yaml/parser/basic_structures.hpp +++ b/include/boost/yaml/parser/basic_structures.hpp @@ -8,8 +8,8 @@ #ifndef BOOST_YAML_PARSER_BASIC_STRUCTURES_HPP #define BOOST_YAML_PARSER_BASIC_STRUCTURES_HPP -#include -#include +#include +#include namespace boost { namespace yaml { namespace parser { @@ -74,7 +74,7 @@ namespace boost { namespace yaml { namespace parser { }}} #if BOOST_YAML_HEADER_ONLY -#include +#include #endif #endif diff --git a/yaml/parser/basic_structures_def.hpp b/include/boost/yaml/parser/basic_structures_def.hpp similarity index 99% rename from yaml/parser/basic_structures_def.hpp rename to include/boost/yaml/parser/basic_structures_def.hpp index ea8368a8..ebe278b0 100644 --- a/yaml/parser/basic_structures_def.hpp +++ b/include/boost/yaml/parser/basic_structures_def.hpp @@ -8,7 +8,7 @@ #ifndef BOOST_YAML_PARSER_BASIC_STRUCTURES_DEF_HPP #define BOOST_YAML_PARSER_BASIC_STRUCTURES_DEF_HPP -#include +#include #include #include diff --git a/yaml/parser/block_styles.hpp b/include/boost/yaml/parser/block_styles.hpp similarity index 96% rename from yaml/parser/block_styles.hpp rename to include/boost/yaml/parser/block_styles.hpp index 3972905e..7cb02a0b 100644 --- a/yaml/parser/block_styles.hpp +++ b/include/boost/yaml/parser/block_styles.hpp @@ -8,8 +8,8 @@ #ifndef BOOST_YAML_PARSER_BLOCK_STYLES_HPP #define BOOST_YAML_PARSER_BLOCK_STYLES_HPP -#include -#include +#include +#include namespace boost { namespace yaml { namespace parser { @@ -102,7 +102,7 @@ namespace boost { namespace yaml { namespace parser { }}} #if BOOST_YAML_HEADER_ONLY -#include +#include #endif #endif diff --git a/yaml/parser/block_styles_def.hpp b/include/boost/yaml/parser/block_styles_def.hpp similarity index 99% rename from yaml/parser/block_styles_def.hpp rename to include/boost/yaml/parser/block_styles_def.hpp index b60596fc..5a555f38 100644 --- a/yaml/parser/block_styles_def.hpp +++ b/include/boost/yaml/parser/block_styles_def.hpp @@ -8,7 +8,7 @@ #ifndef BOOST_YAML_PARSER_BLOCK_STYLES_DEF_HPP #define BOOST_YAML_PARSER_BLOCK_STYLES_DEF_HPP -#include +#include #include #include diff --git a/yaml/parser/characters.hpp b/include/boost/yaml/parser/characters.hpp similarity index 90% rename from yaml/parser/characters.hpp rename to include/boost/yaml/parser/characters.hpp index af2ab820..fb7cdbb7 100644 --- a/yaml/parser/characters.hpp +++ b/include/boost/yaml/parser/characters.hpp @@ -8,7 +8,7 @@ #ifndef BOOST_YAML_PARSER_CHARACTERS_HPP #define BOOST_YAML_PARSER_CHARACTERS_HPP -#include +#include namespace boost { namespace yaml { namespace parser { @@ -30,7 +30,7 @@ namespace boost { namespace yaml { namespace parser { }}} #if BOOST_YAML_HEADER_ONLY -#include +#include #endif #endif diff --git a/yaml/parser/characters_def.hpp b/include/boost/yaml/parser/characters_def.hpp similarity index 99% rename from yaml/parser/characters_def.hpp rename to include/boost/yaml/parser/characters_def.hpp index de4a0a46..a5f5ee72 100644 --- a/yaml/parser/characters_def.hpp +++ b/include/boost/yaml/parser/characters_def.hpp @@ -10,7 +10,7 @@ #ifndef BOOST_YAML_PARSER_CHARACTERS_DEF_HPP #define BOOST_YAML_PARSER_CHARACTERS_DEF_HPP -#include +#include #include #include diff --git a/yaml/parser/error_handler.hpp b/include/boost/yaml/parser/error_handler.hpp similarity index 99% rename from yaml/parser/error_handler.hpp rename to include/boost/yaml/parser/error_handler.hpp index 5f54218f..f3fb1a72 100644 --- a/yaml/parser/error_handler.hpp +++ b/include/boost/yaml/parser/error_handler.hpp @@ -10,7 +10,7 @@ #ifndef BOOST_YAML_PARSER_ERROR_HANDLER_HPP #define BOOST_YAML_PARSER_ERROR_HANDLER_HPP -#include +#include #include #include diff --git a/yaml/parser/flow_styles.hpp b/include/boost/yaml/parser/flow_styles.hpp similarity index 97% rename from yaml/parser/flow_styles.hpp rename to include/boost/yaml/parser/flow_styles.hpp index 7238d870..5da2f5be 100644 --- a/yaml/parser/flow_styles.hpp +++ b/include/boost/yaml/parser/flow_styles.hpp @@ -8,8 +8,8 @@ #ifndef BOOST_YAML_PARSER_FLOW_STYLES_HPP #define BOOST_YAML_PARSER_FLOW_STYLES_HPP -#include -#include +#include +#include namespace boost { namespace yaml { namespace parser { @@ -102,7 +102,7 @@ namespace boost { namespace yaml { namespace parser { }}} #if BOOST_YAML_HEADER_ONLY -#include +#include #endif #endif diff --git a/yaml/parser/flow_styles_def.hpp b/include/boost/yaml/parser/flow_styles_def.hpp similarity index 99% rename from yaml/parser/flow_styles_def.hpp rename to include/boost/yaml/parser/flow_styles_def.hpp index 85e6b467..7a353547 100644 --- a/yaml/parser/flow_styles_def.hpp +++ b/include/boost/yaml/parser/flow_styles_def.hpp @@ -8,7 +8,7 @@ #ifndef BOOST_YAML_PARSER_FLOW_STYLES_DEF_HPP #define BOOST_YAML_PARSER_FLOW_STYLES_DEF_HPP -#include +#include #include #include diff --git a/yaml/parser/parser_fwd.hpp b/include/boost/yaml/parser/parser_fwd.hpp similarity index 98% rename from yaml/parser/parser_fwd.hpp rename to include/boost/yaml/parser/parser_fwd.hpp index 53d6d94a..fd237f96 100644 --- a/yaml/parser/parser_fwd.hpp +++ b/include/boost/yaml/parser/parser_fwd.hpp @@ -8,8 +8,8 @@ #ifndef BOOST_YAML_PARSER_PARSER_FWD_HPP #define BOOST_YAML_PARSER_PARSER_FWD_HPP -#include -#include +#include +#include #include #include @@ -252,7 +252,7 @@ namespace boost { namespace yaml { namespace parser { }}} -#include +#include namespace boost { namespace yaml { namespace parser { namespace detail { diff --git a/yaml/parser/stream.hpp b/include/boost/yaml/parser/stream.hpp similarity index 95% rename from yaml/parser/stream.hpp rename to include/boost/yaml/parser/stream.hpp index 6112f5cb..a2e207c4 100644 --- a/yaml/parser/stream.hpp +++ b/include/boost/yaml/parser/stream.hpp @@ -8,8 +8,8 @@ #ifndef BOOST_YAML_PARSER_STREAM_HPP #define BOOST_YAML_PARSER_STREAM_HPP -#include -#include +#include +#include namespace boost { namespace yaml { namespace parser { @@ -94,7 +94,7 @@ namespace boost { namespace yaml { namespace parser { }}} #if BOOST_YAML_HEADER_ONLY -#include +#include #endif #endif diff --git a/yaml/parser/stream_def.hpp b/include/boost/yaml/parser/stream_def.hpp similarity index 99% rename from yaml/parser/stream_def.hpp rename to include/boost/yaml/parser/stream_def.hpp index e19cbe13..c38fd8ea 100644 --- a/yaml/parser/stream_def.hpp +++ b/include/boost/yaml/parser/stream_def.hpp @@ -8,7 +8,7 @@ #ifndef BOOST_YAML_PARSER_STREAM_DEF_HPP #define BOOST_YAML_PARSER_STREAM_DEF_HPP -#include +#include #include #include diff --git a/perf/make_parser_perf_test.py b/perf/make_parser_perf_test.py index ebda6166..0334188c 100755 --- a/perf/make_parser_perf_test.py +++ b/perf/make_parser_perf_test.py @@ -62,7 +62,7 @@ for test in tests: test_function_names += 'BENCHMARK({});\n'.format(test_name) full_test = ''' -#include +#include #include #include diff --git a/perf/parse_perf.cpp b/perf/parse_perf.cpp index a81f9156..ca04a3d9 100644 --- a/perf/parse_perf.cpp +++ b/perf/parse_perf.cpp @@ -1,5 +1,5 @@ -#include +#include #include #include diff --git a/src/basic_structures.cpp b/src/basic_structures.cpp index f65e637f..a4d03852 100644 --- a/src/basic_structures.cpp +++ b/src/basic_structures.cpp @@ -5,4 +5,4 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include +#include diff --git a/src/block_style.cpp b/src/block_style.cpp index c968193e..939c9728 100644 --- a/src/block_style.cpp +++ b/src/block_style.cpp @@ -5,4 +5,4 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include +#include diff --git a/src/characters.cpp b/src/characters.cpp index 8b446e32..7e9fd80b 100644 --- a/src/characters.cpp +++ b/src/characters.cpp @@ -5,4 +5,4 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include +#include diff --git a/src/flow_style.cpp b/src/flow_style.cpp index 0eaa9e60..dbac0837 100644 --- a/src/flow_style.cpp +++ b/src/flow_style.cpp @@ -5,4 +5,4 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include +#include diff --git a/src/stream.cpp b/src/stream.cpp index 0dc903f0..270344f5 100644 --- a/src/stream.cpp +++ b/src/stream.cpp @@ -5,4 +5,4 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include +#include diff --git a/test/parse_yaml_compare_test.cpp b/test/parse_yaml_compare_test.cpp index 39036153..c7dddd1a 100644 --- a/test/parse_yaml_compare_test.cpp +++ b/test/parse_yaml_compare_test.cpp @@ -5,7 +5,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include +#include #include diff --git a/test/parse_yaml_round_trip_test.cpp b/test/parse_yaml_round_trip_test.cpp index 9330a15b..8ff655ed 100644 --- a/test/parse_yaml_round_trip_test.cpp +++ b/test/parse_yaml_round_trip_test.cpp @@ -7,7 +7,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include +#include #include diff --git a/test/parse_yaml_test.cpp b/test/parse_yaml_test.cpp index 56cf6edb..ae53592c 100644 --- a/test/parse_yaml_test.cpp +++ b/test/parse_yaml_test.cpp @@ -7,7 +7,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include +#include #include diff --git a/test/warnings_test.cpp b/test/warnings_test.cpp index 0a975d54..96f91114 100644 --- a/test/warnings_test.cpp +++ b/test/warnings_test.cpp @@ -5,7 +5,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include +#include #include