Skip to content

Commit 5abab00

Browse files
authored
fix MSVC C++20 module build error C2872, C2039, C2873 on 'literals' (#267)
1 parent 2693c6c commit 5abab00

File tree

1 file changed

+43
-42
lines changed

1 file changed

+43
-42
lines changed

src/modules/tomlpp.cppm

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
module;
77

8+
#define TOML_UNDEF_MACROS 0
89
#include <toml++/toml.hpp>
910

1011
export module tomlplusplus;
@@ -19,49 +20,49 @@ export namespace toml {
1920
* @brief The toml++ namespace toml::literals::
2021
*/
2122
inline namespace literals {
22-
using toml::literals::operator""_toml;
23-
using toml::literals::operator""_tpath;
23+
using TOML_NAMESPACE::literals::operator""_toml;
24+
using TOML_NAMESPACE::literals::operator""_tpath;
2425
}
2526

26-
using toml::array;
27-
using toml::date;
28-
using toml::date_time;
29-
using toml::inserter;
30-
using toml::json_formatter;
31-
using toml::key;
32-
using toml::node;
33-
using toml::node_view;
34-
using toml::parse_error;
35-
using toml::parse_result;
36-
using toml::path;
37-
using toml::path_component;
38-
using toml::source_position;
39-
using toml::source_region;
40-
using toml::table;
41-
using toml::time;
42-
using toml::time_offset;
43-
using toml::toml_formatter;
44-
using toml::value;
45-
using toml::yaml_formatter;
46-
using toml::format_flags;
47-
using toml::node_type;
48-
using toml::path_component_type;
49-
using toml::value_flags;
50-
using toml::array_iterator;
51-
using toml::const_array_iterator;
52-
using toml::const_table_iterator;
53-
using toml::default_formatter;
54-
using toml::inserted_type_of;
55-
using toml::optional;
56-
using toml::source_index;
57-
using toml::source_path_ptr;
58-
using toml::table_iterator;
27+
using TOML_NAMESPACE::array;
28+
using TOML_NAMESPACE::date;
29+
using TOML_NAMESPACE::date_time;
30+
using TOML_NAMESPACE::inserter;
31+
using TOML_NAMESPACE::json_formatter;
32+
using TOML_NAMESPACE::key;
33+
using TOML_NAMESPACE::node;
34+
using TOML_NAMESPACE::node_view;
35+
using TOML_NAMESPACE::parse_error;
36+
using TOML_NAMESPACE::parse_result;
37+
using TOML_NAMESPACE::path;
38+
using TOML_NAMESPACE::path_component;
39+
using TOML_NAMESPACE::source_position;
40+
using TOML_NAMESPACE::source_region;
41+
using TOML_NAMESPACE::table;
42+
using TOML_NAMESPACE::time;
43+
using TOML_NAMESPACE::time_offset;
44+
using TOML_NAMESPACE::toml_formatter;
45+
using TOML_NAMESPACE::value;
46+
using TOML_NAMESPACE::yaml_formatter;
47+
using TOML_NAMESPACE::format_flags;
48+
using TOML_NAMESPACE::node_type;
49+
using TOML_NAMESPACE::path_component_type;
50+
using TOML_NAMESPACE::value_flags;
51+
using TOML_NAMESPACE::array_iterator;
52+
using TOML_NAMESPACE::const_array_iterator;
53+
using TOML_NAMESPACE::const_table_iterator;
54+
using TOML_NAMESPACE::default_formatter;
55+
using TOML_NAMESPACE::inserted_type_of;
56+
using TOML_NAMESPACE::optional;
57+
using TOML_NAMESPACE::source_index;
58+
using TOML_NAMESPACE::source_path_ptr;
59+
using TOML_NAMESPACE::table_iterator;
5960

60-
using toml::at_path;
61-
using toml::get_line;
62-
using toml::operator""_toml;
63-
using toml::operator""_tpath;
64-
using toml::operator<<;
65-
using toml::parse;
66-
using toml::parse_file;
61+
using TOML_NAMESPACE::at_path;
62+
using TOML_NAMESPACE::get_line;
63+
using TOML_NAMESPACE::operator""_toml;
64+
using TOML_NAMESPACE::operator""_tpath;
65+
using TOML_NAMESPACE::operator<<;
66+
using TOML_NAMESPACE::parse;
67+
using TOML_NAMESPACE::parse_file;
6768
}

0 commit comments

Comments
 (0)