Skip to content

Commit

Permalink
Add forward declaration header (#422)
Browse files Browse the repository at this point in the history
* added fkyaml_fwd.hpp to provide forward declarations

* no include of cpp_config_macros.hpp in version_macros.hpp & added define_macros.hpp

* updated amalgamation scripts and CONTRIBUTING.md

* added descriptions about the header file for forward declarations
  • Loading branch information
fktn-k authored Nov 12, 2024
1 parent aaaff43 commit 5f59b13
Show file tree
Hide file tree
Showing 55 changed files with 374 additions and 138 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To make changes to the fkYAML project, you need to edit the following files:

### 1. [`include/fkYAML/**.hpp`](https://github.com/fktn-k/fkYAML/tree/develop/include/fkYAML)

These files are the sources of the fkYAML library and **DO NOT** directly change the single header version under the [`single_include`](https://github.com/fktn-k/fkYAML/tree/develop/single_include/) directory. Alghough amalgamation is automatically executed in the GitHub Actions workflows, you can run the script ([`run_amalgamation.bat`](https://github.com/fktn-k/fkYAML/scripts/run_amalgamation.bat) for Windows, [`run_amalgamation.sh`](https://github.com/fktn-k/fkYAML/scripts/run_amalgamation.sh) otherwise) to regenerate [`single_include/fkYAML/node.hpp`](https://github.com/fktn-k/fkYAML/tree/develop/single_include/fkYAML/node.hpp) locally, which will save you from waiting unnecessarily long for the workflow results.
These files are the sources of the fkYAML library and **DO NOT** directly change the files under the [`single_include`](https://github.com/fktn-k/fkYAML/tree/develop/single_include/) directory. Alghough amalgamation is automatically executed in the GitHub Actions workflows, you can run the script ([`run_amalgamation.bat`](https://github.com/fktn-k/fkYAML/scripts/run_amalgamation.bat) for Windows, [`run_amalgamation.sh`](https://github.com/fktn-k/fkYAML/scripts/run_amalgamation.sh) otherwise) to regenerate [`single_include/fkYAML/node.hpp`](https://github.com/fktn-k/fkYAML/blob/develop/single_include/fkYAML/node.hpp) and [`single_include/fkYAML/fkyaml_fwd.hpp`](https://github.com/fktn-k/fkYAML/blob/develop/single_include/fkYAML/fkyaml_fwd.hpp) locally, which will save us from waiting unnecessarily long for the workflow results.

**Windows (Command Prompt)**
```batch
Expand All @@ -41,7 +41,7 @@ cd path/to/fkYAML
scripts/run_amalgamation.sh
```

If you just want to check if amalgamation is needed locally, run the script ([`run_amalgamation.bat`](https://github.com/fktn-k/fkYAML/scripts/run_amalgamation.bat) for Windows, [`run_amalgamation.sh`](https://github.com/fktn-k/fkYAML/scripts/run_amalgamation.sh) otherwise) with the following commands:
If you just want to check if amalgamation is needed locally, run the script ([`check_amalgamation.bat`](https://github.com/fktn-k/fkYAML/blob/develop/scripts/check_amalgamation.bat) for Windows, [`check_amalgamation.sh`](https://github.com/fktn-k/fkYAML/blob/develop/scripts/check_amalgamation.sh) otherwise) with the following commands:

**Windows (Command Prompt)**
```batch
Expand Down Expand Up @@ -106,7 +106,7 @@ The commands above will automatically install all the dependencies using [Python
### 4. Format source files

[GitHub Actions](https://github.com/fktn-k/fkYAML/actions) will test the updated project with the [Clang-Format](https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.3) tool (18.1.3) once you open a PR or push commits afterwards which include changes in the source files under either [`include`](https://github.com/fktn-k/fkYAML/tree/develop/include) or [`test`](https://github.com/fktn-k/fkYAML/tree/develop/test) directories.
Although code formatting is automatically executed in the GitHub Actions workflows, you can run the script files ([`run_clang_format.bat`](https://github.com/fktn-k/fkYAML/scripts/run_clang_format.bat) for Windows, [`run_clang_format.sh`](https://github.com/fktn-k/fkYAML/scripts/run_clang_format.sh) otherwise) to check if your changes follow the rules defined in the [`.clang-format`](https://github.com/fktn-k/fkYAML/tree/develop/.clang-format) file on your local environment in advance.
Although code formatting is automatically executed in the GitHub Actions workflows, you can run the script files ([`run_clang_format.bat`](https://github.com/fktn-k/fkYAML/blob/develop/scripts/run_clang_format.bat) for Windows, [`run_clang_format.sh`](https://github.com/fktn-k/fkYAML/blob/develop/scripts/run_clang_format.sh) otherwise) to check if your changes follow the rules defined in the [`.clang-format`](https://github.com/fktn-k/fkYAML/blob/develop/.clang-format) file on your local environment in advance.
Note that, since the Clang-Format tool does not gurantee backward compatibility especially in its edge cases and its behaviors might therefore vary from version to version, it's highly recommended that you use the above script files to avoid unnecessary confusion for that kind of reason.
The scripts uses [the Clang-Format Python distribution](https://pypi.org/project/clang-format/18.1.3/) and installs it using [the Python venv module](https://docs.python.org/3/library/venv.html) if it's not been installed yet.
You can run the scripts with the following commands:
Expand All @@ -128,7 +128,7 @@ scripts/run_clang_format.sh
When you open a pull request, fkYAML will automatically be built/tested with (1) various combinations of compilers and operating systems and (2) analyzers such as [Valgrind](https://valgrind.org/) and [Clang Sanitizers](https://clang.llvm.org/docs/index.html) to detect runtime issues (e.g., memory leaks), on [GitHub Actions](https://github.com/fktn-k/fkYAML/actions) once you open a pull request.
These can result in failing builds and/or unit tests which run successfully on your local environment.
As a policy of this project, however, all the workflow checks must be passed before merging.
You can run tests with those tools with the following commands:
You can run tests with those tools locally by executing the following commands:

**Valgrind** (assuming Valgrind is already installed.)
```bash
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ There are a lot of YAML libraries out there, and each may have its reason to exi
fkYAML has been developed with these design goals:

### :briefcase: **Portable**
The whole code depends only on C++ standards, and is carefully designed to work on many platforms so that fkYAML can be imported into existing C++ projects written in C++11 or better.
The library depends only on C++ standards, and is carefully designed to work on many platforms so that fkYAML can be imported into existing C++ projects written in C++11 or better.
No external dependencies, no sub-project, or no additional compiler flags are required.
Although fkYAML is a library with multiple header files by default, you can use the single-header version located in the [single_include](https://github.com/fktn-k/tree/develop/single_include) directory.
Although fkYAML is a library with multiple header files by default, you can use the single-header version ([single_include/fkYAML/node.hpp](https://github.com/fktn-k/fkYAML/blob/develop/single_include/fkYAML/node.hpp)) located in the [single_include](https://github.com/fktn-k/tree/develop/single_include) directory. You can further use [single_include/fkYAML/fkyaml_fwd.hpp](https://github.com/fktn-k/fkYAML/blob/develop/single_include/fkYAML/fkyaml_fwd.hpp) for forward declarations.
Furthermore, the project supports [CMake](https://cmake.org/) and provides [the documentation exclusively for CMake integration](https://fktn-k.github.io/fkYAML/tutorials/cmake_integration).
Those characteristics allow existing C++ project using CMake for builds to quickly incorporate YAML support with just a little effort.

Expand Down
4 changes: 2 additions & 2 deletions docs/mkdocs/docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ There are a lot of YAML libraries out there, and each may have its reason to exi
fkYAML has been developed with these design goals:

### :briefcase: **Portable**
: The whole code depends only on C++ standards, and is carefully designed to work on many platforms so that fkYAML can be imported into existing C++ projects written in C++11 or better.
: The library depends only on C++ standards, and is carefully designed to work on many platforms so that fkYAML can be imported into existing C++ projects written in C++11 or better.
No external dependencies, no sub-project, or no additional compiler flags are required.
Although fkYAML is a library with multiple header files by default, you can use the single-header version located in the [single_include](https://github.com/fktn-k/tree/develop/single_include) directory.
Although fkYAML is a library with multiple header files by default, you can use the single-header version ([single_include/fkYAML/node.hpp](https://github.com/fktn-k/fkYAML/blob/develop/single_include/fkYAML/node.hpp)) located in the [single_include](https://github.com/fktn-k/tree/develop/single_include) directory. You can further use [single_include/fkYAML/fkyaml_fwd.hpp](https://github.com/fktn-k/fkYAML/blob/develop/single_include/fkYAML/fkyaml_fwd.hpp) for forward declarations.
Furthermore, the project supports [CMake](https://cmake.org/) and provides [the documentation exclusively for CMake integration](https://fktn-k.github.io/fkYAML/tutorials/cmake_integration).
Those characteristics allow existing C++ project using CMake for builds to quickly incorporate YAML support with just a little effort.

Expand Down
6 changes: 3 additions & 3 deletions docs/mkdocs/docs/tutorials/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Although you can just copy, paste and include the header files in your C++ proje
The followings are possible ways of preparing for the use of fkYAML:

### :file_folder: Download a release package
You can [download the latest package (fkYAML.tgz for UNIX or fkYAML.zip for Windows) from here](https://github.com/fktn-k/fkYAML/releases/latest).
The single-header version of the fkYAML package can also be downloaded since v0.3.1 with the name of fkYAML_single_header.{tgz|zip}.
You can [download the latest package (fkYAML.tgz or fkYAML.zip) from here](https://github.com/fktn-k/fkYAML/releases/latest).
The single-header versions can also be downloaded since v0.3.1 with the name of fkYAML_single_header.{tgz|zip}.
After the download gets completed, unzip and put the package in some directory on your machine.
The destination path can be whatever you want, and you're all set!

Expand Down Expand Up @@ -58,7 +58,7 @@ Note that you must execute the CMake `add_subdirectory()` command for the submod
Let's start with a really simple example.
Say you have an example.yaml file and now you want to load the contents.
Note that the following example files assumes that you have installed the fkYAML library somewhere on your machine.
See [the CMake Integration section]() for the other ways and modify the implementation if necessary.
See [the CMake Integration section](./cmake_integration.md) for the other ways and modify the implementation if necessary.
Also, make sure the example.yaml file is encoded in either the UTF-8, UTF-16BE/LE or UTF-32BE/LE format.

```title="Project Structure"
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/conversions/from_node.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <utility>
#include <valarray>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/node_traits.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>
#include <fkYAML/detail/meta/type_traits.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/conversions/scalar_conv.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <cstring>
#include <limits>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/type_traits.hpp>

#if FK_YAML_HAS_TO_CHARS
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/conversions/to_node.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <utility>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/node_traits.hpp>
#include <fkYAML/detail/meta/type_traits.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/conversions/to_string.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <sstream>
#include <type_traits>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>
#include <fkYAML/detail/meta/type_traits.hpp>

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/document_metainfo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <string>
#include <map>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/node_traits.hpp>
#include <fkYAML/yaml_version_type.hpp>

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/encodings/uri_encoding.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <cctype>
#include <string>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/encodings/utf_encode_detector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <cstdint>
#include <istream>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/encodings/utf_encode_t.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>
#include <fkYAML/detail/meta/type_traits.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/encodings/utf_encode_t.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <cstdint>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/encodings/utf_encodings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <array>
#include <cstdint>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/exception.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/encodings/yaml_escaper.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <string>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/assert.hpp>
#include <fkYAML/detail/encodings/utf_encodings.hpp>
#include <fkYAML/exception.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/input/block_scalar_header.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <cstdint>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/input/deserializer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <deque>
#include <vector>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/document_metainfo.hpp>
#include <fkYAML/detail/input/lexical_analyzer.hpp>
#include <fkYAML/detail/input/scalar_parser.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/input/input_adapter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <iterator>
#include <string>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/assert.hpp>
#include <fkYAML/detail/encodings/utf_encode_detector.hpp>
#include <fkYAML/detail/encodings/utf_encode_t.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/input/lexical_analyzer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <cctype>
#include <cstdlib>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/assert.hpp>
#include <fkYAML/detail/encodings/uri_encoding.hpp>
#include <fkYAML/detail/encodings/utf_encodings.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/input/position_tracker.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <algorithm>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/str_view.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/input/scalar_parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef FK_YAML_DETAIL_INPUT_SCALAR_PARSER_HPP
#define FK_YAML_DETAIL_INPUT_SCALAR_PARSER_HPP

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/assert.hpp>
#include <fkYAML/detail/conversions/scalar_conv.hpp>
#include <fkYAML/detail/encodings/yaml_escaper.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/input/scalar_scanner.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <cstring>
#include <string>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/assert.hpp>
#include <fkYAML/node_type.hpp>

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/input/tag_resolver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <memory>
#include <string>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/assert.hpp>
#include <fkYAML/detail/document_metainfo.hpp>
#include <fkYAML/detail/input/tag_t.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/input/tag_t.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <cstdint>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/iterator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <cstddef>
#include <iterator>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/node_traits.hpp>
#include <fkYAML/exception.hpp>

Expand Down
15 changes: 15 additions & 0 deletions include/fkYAML/detail/macros/define_macros.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// _______ __ __ __ _____ __ __ __
// | __| |_/ | \_/ |/ _ \ / \/ \| | fkYAML: A C++ header-only YAML library
// | __| _ < \_ _/| ___ | _ | |___ version 0.3.13
// |__| |_| \__| |_| |_| |_|___||___|______| https://github.com/fktn-k/fkYAML
//
// SPDX-FileCopyrightText: 2023-2024 Kensuke Fukutani <[email protected]>
// SPDX-License-Identifier: MIT

#ifndef FK_YAML_DETAIL_MACROS_DEFINE_MACROS_HPP
#define FK_YAML_DETAIL_MACROS_DEFINE_MACROS_HPP

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/cpp_config_macros.hpp>

#endif /* FK_YAML_DETAIL_MACROS_DEFINE_MACROS_HPP */
2 changes: 0 additions & 2 deletions include/fkYAML/detail/macros/version_macros.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,4 @@
} /* namespace detail */ \
FK_YAML_NAMESPACE_END

#include <fkYAML/detail/macros/cpp_config_macros.hpp>

#endif // !defined(FK_YAML_VERCHECK_SUCCEEDED)
2 changes: 1 addition & 1 deletion include/fkYAML/detail/meta/detect.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <iterator>
#include <type_traits>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/meta/input_adapter_traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <type_traits>
#include <vector>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/detect.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>

Expand Down
14 changes: 2 additions & 12 deletions include/fkYAML/detail/meta/node_traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,11 @@
#ifndef FK_YAML_DETAIL_META_NODE_TRAITS_HPP
#define FK_YAML_DETAIL_META_NODE_TRAITS_HPP

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/detect.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>
#include <fkYAML/detail/meta/type_traits.hpp>

FK_YAML_NAMESPACE_BEGIN

// forward declaration for basic_node<...>
template <
template <typename, typename...> class SequenceType, template <typename, typename, typename...> class MappingType,
typename BooleanType, typename IntegerType, typename FloatNumberType, typename StringType,
template <typename, typename> class ConverterType>
class basic_node;

FK_YAML_NAMESPACE_END
#include <fkYAML/fkyaml_fwd.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/meta/stl_supplement.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <cstddef>
#include <type_traits>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>

#ifdef FK_YAML_HAS_CXX_14
#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/meta/type_traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <limits>
#include <type_traits>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/detect.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/node_attrs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <cstdint>
#include <limits>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/node_type.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/node_property.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <string>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/node_ref_storage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <type_traits>
#include <utility>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/node_traits.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>

Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/output/serializer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <string>
#include <vector>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/conversions/to_string.hpp>
#include <fkYAML/detail/encodings/yaml_escaper.hpp>
#include <fkYAML/detail/input/scalar_scanner.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/str_view.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <limits>
#include <string>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>
#include <fkYAML/detail/meta/stl_supplement.hpp>
#include <fkYAML/detail/meta/type_traits.hpp>
#include <fkYAML/exception.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fkYAML/detail/string_formatter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <memory>
#include <string>

#include <fkYAML/detail/macros/version_macros.hpp>
#include <fkYAML/detail/macros/define_macros.hpp>

FK_YAML_DETAIL_NAMESPACE_BEGIN

Expand Down
Loading

0 comments on commit 5f59b13

Please sign in to comment.