Skip to content

Fix date_time.hpp error and header generator warnings #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marzer merged 5 commits into from
Apr 17, 2026
Merged

Fix date_time.hpp error and header generator warnings #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
724afb6
Fix date_time.hpp error and header generator warnings
dwithun-dev Apr 15, 2026
3e3920f
Remove TOML_DISABLE preprocessor directives
dwithun-dev Apr 15, 2026
9d96994
Merge branch 'master' into optional_error
dwithun-dev Apr 15, 2026
6004ca9
Add TOML_DISABLE_CONDITIONAL_NOEXCEPT_LAMBDA and TOML_DISABLE_NOEXCEP…
dwithun-dev Apr 16, 2026
176997e
Updated Ignore list
dwithun-dev Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/toml++/impl/date_time.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include "forward_declarations.hpp"
#include "print_to_stream.hpp"
#include "std_optional.hpp"
#include "header_start.hpp"

TOML_NAMESPACE_START
Expand Down
8 changes: 5 additions & 3 deletions tools/generate_single_header.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def main():
# blank lines between consecutive TOML_XXXXX_WARNINGS statements
toml_h = re.sub('(TOML_[A-Z_]+?_WARNINGS;)\n[ \t\n]*\n(TOML_[A-Z_]+?_WARNINGS;)', r'\1\n\2', toml_h)
# blank lines between consecutive #includes
toml_h = re.sub('[#]\s*include\s*<(.+?)>\n[ \t\n]*\n[#]\s*include\s*<(.+?)>', r'#include <\1>\n#include <\2>', toml_h)
toml_h = re.sub(r'[#]\s*include\s*<(.+?)>\n[ \t\n]*\n[#]\s*include\s*<(.+?)>', r'#include <\1>\n#include <\2>', toml_h)
# blank lines following opening brackets or a comma
toml_h = re.sub(r'([^@][({,])\n\n', r'\1\n', toml_h)
# blank lines preceeding closing brackets
Expand All @@ -129,7 +129,7 @@ def main():

# change TOML_LIB_SINGLE_HEADER to 1
toml_h = re.sub(
'#\s*define\s+TOML_LIB_SINGLE_HEADER\s+[0-9]+',
r'#\s*define\s+TOML_LIB_SINGLE_HEADER\s+[0-9]+',
'#define TOML_LIB_SINGLE_HEADER 1',
toml_h, 0, re.I
)
Expand Down Expand Up @@ -242,7 +242,9 @@ def main():
r'TOML_UNDEF_MACROS',
r'TOMLPLUSPLUS_H',
r'TOMLPLUSPLUS_HPP',
r'TOML_SHARED_LIB'
r'TOML_SHARED_LIB',
r'TOML_DISABLE_CONDITIONAL_NOEXCEPT_LAMBDA',
r'TOML_DISABLE_NOEXCEPT_NOEXCEPT'
)
set_defines = []
for define, currently_set in defines.items():
Expand Down
Loading