Skip to content

Reduce default number of enumerators for MSVC compatibility #26

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

Open
quicknir wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Reduce default number of enumerators for MSVC compatibility #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3023430
Reduce default number of enumerators for MSVC compatibility
quicknir May 20, 2019
34d400f
Further appveyor fix for x64 environ
quicknir May 20, 2019
0458e4e
Add MSVC 17 to matrix
quicknir May 20, 2019
0813466
Add MSVC macro counting workaround
quicknir May 20, 2019
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
6 changes: 5 additions & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ environment:
- GENERATOR: "Visual Studio 15 Win64"
CONFIG: Release

- GENERATOR: "Visual Studio 17 Win64"
CONFIG: Release

build_script:
- vcpkg install catch2
- vcpkg install catch2:x86-windows
- vcpkg install catch2:x64-windows
- ps: cd test
- cmake -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake "-G%GENERATOR%" -H. -B_builds -DENABLE_TESTING=1
- cmake --build _builds --config "%CONFIG%"
Expand Down
6 changes: 5 additions & 1 deletion wise_enum_detail.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,12 @@ WISE_ENUM_CONSTEXPR_14 bool compare(U u1, U u2) {
} // namespace detail
} // namespace wise_enum

// MSVC workaround
#define WISE_ENUM_IMPL_EXPAND(X) X

#define WISE_ENUM_IMPL_NARG(...) \
WISE_ENUM_IMPL_NARG_(__VA_ARGS__, WISE_ENUM_IMPL_RSEQ_N())
WISE_ENUM_IMPL_EXPAND( \
WISE_ENUM_IMPL_NARG_(__VA_ARGS__, WISE_ENUM_IMPL_RSEQ_N()))
#define WISE_ENUM_IMPL_NARG_(...) WISE_ENUM_IMPL_ARG_N(__VA_ARGS__)

// ARG_N and RSEQ_N defined in wise_enum_generated.h
Expand Down
Loading