Skip to content

[optional] Fix duplicate declaration of stx::in_place_t #8

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
jbadorek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[optional] Fix duplicate declaration of stx::in_place_t #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions include/stx/optional.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@
using std::nullopt_t;
using std::nullopt;
using std::make_optional;
# ifndef STX_HAVE_IN_PLACE_T
using std::in_place_t;
using std::in_place;
# define STX_HAVE_IN_PLACE_T 1
# endif
}
# define STX_HAVE_STD_OPTIONAL 1
# elif __has_include(<experimental/optional>)
Expand All @@ -49,8 +52,11 @@
using std::experimental::nullopt_t;
using std::experimental::nullopt;
using std::experimental::make_optional;
# ifndef STX_HAVE_IN_PLACE_T
using std::experimental::in_place_t;
using std::experimental::in_place;
# define STX_HAVE_IN_PLACE_T 1
# endif
}
# define STX_HAVE_STD_OPTIONAL 1
# endif // __hasinclude(optional)
Expand Down
2 changes: 1 addition & 1 deletion include/stx/variant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
# ifndef STX_HAVE_IN_PLACE_T
using std::in_place_t;
using std::in_place;
# define STX_IN_PLACE_T 1
# define STX_HAVE_IN_PLACE_T 1
# endif
using std::in_place_type_t;
using std::in_place_type;
Expand Down