Skip to content

Add MAGIC_ENUM_USE_STD_MODULE option to use standard library module. #350

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
Neargye merged 7 commits into from
May 27, 2024
Merged

Add MAGIC_ENUM_USE_STD_MODULE option to use standard library module. #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb5fa8b
Skip standard library header inclusion if using standard library module.
stripe2933 May 9, 2024
5719ec0
Missing export: std::formatter for enums.
stripe2933 May 9, 2024
2fb8c77
Fix MSVC warning (Global module fragment can only contains preprocess…
stripe2933 May 9, 2024
f4015bb
Fix compilation error.
stripe2933 May 10, 2024
b9a7f76
Suppress false-positive warning
stripe2933 May 10, 2024
a3934f7
Move magic_enum.cppm to module directory.
stripe2933 May 11, 2024
61b2378
<version> header required for __cpp_lib_format feature test macro.
stripe2933 May 26, 2024
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
4 changes: 4 additions & 0 deletions include/magic_enum/magic_enum.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,21 @@
#define MAGIC_ENUM_VERSION_MINOR 9
#define MAGIC_ENUM_VERSION_PATCH 5

#ifndef MAGIC_ENUM_USE_STD_MODULE
#include <array>
#include <cstddef>
#include <cstdint>
#include <functional>
#include <limits>
#include <type_traits>
#include <utility>
#endif

#if defined(MAGIC_ENUM_CONFIG_FILE)
# include MAGIC_ENUM_CONFIG_FILE
#endif

#ifndef MAGIC_ENUM_USE_STD_MODULE
#if !defined(MAGIC_ENUM_USING_ALIAS_OPTIONAL)
# include <optional>
#endif
Expand All @@ -57,6 +60,7 @@
#if !defined(MAGIC_ENUM_USING_ALIAS_STRING_VIEW)
# include <string_view>
#endif
#endif

#if defined(MAGIC_ENUM_NO_ASSERT)
# define MAGIC_ENUM_ASSERT(...) static_cast<void>(0)
Expand Down
4 changes: 4 additions & 0 deletions include/magic_enum/magic_enum_containers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,14 @@
#include "magic_enum.hpp"

#if !defined(MAGIC_ENUM_NO_EXCEPTION) && (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND))
#ifndef MAGIC_ENUM_USE_STD_MODULE
# include <stdexcept>
#endif
# define MAGIC_ENUM_THROW(...) throw (__VA_ARGS__)
#else
#ifndef MAGIC_ENUM_USE_STD_MODULE
# include <cstdlib>
#endif
# define MAGIC_ENUM_THROW(...) std::abort()
#endif

Expand Down
2 changes: 2 additions & 0 deletions include/magic_enum/magic_enum_format.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ namespace magic_enum::customize {

#if defined(__cpp_lib_format)

#ifndef MAGIC_ENUM_USE_STD_MODULE
#include <format>
#endif

template <typename E>
struct std::formatter<E, std::enable_if_t<std::is_enum_v<std::decay_t<E>> && magic_enum::customize::enum_format_enabled<E>(), char>> : std::formatter<std::string_view, char> {
Expand Down
2 changes: 2 additions & 0 deletions include/magic_enum/magic_enum_iostream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
#include "magic_enum.hpp"
#include "magic_enum_flags.hpp"

#ifndef MAGIC_ENUM_USE_STD_MODULE
#include <iosfwd>
#endif

namespace magic_enum {

Expand Down
20 changes: 20 additions & 0 deletions include/magic_enum/magic_enum.cppm → module/magic_enum.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
module;

#include <version>
#ifndef MAGIC_ENUM_USE_STD_MODULE
#include <magic_enum_all.hpp>
#endif

export module magic_enum;

#ifdef MAGIC_ENUM_USE_STD_MODULE
import std;

extern "C++" {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
#include <magic_enum_all.hpp>
#pragma clang diagnostic pop
}
#endif

export namespace magic_enum {
namespace customize {
using customize::enum_range;
Expand Down Expand Up @@ -54,3 +68,9 @@ namespace containers {
using magic_enum::underlying_type;
using magic_enum::underlying_type_t;
}

#if defined(__cpp_lib_format)
export namespace std {
using std::formatter;
}
#endif