Skip to content

Add support for <experimental/scope> header #17

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
merged 1 commit into from
Mar 24, 2025
Merged

Add support for <experimental/scope> header #17

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
34 changes: 24 additions & 10 deletions include/nonstd/scope.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright (c) 2020-2020 Martin Moene
// Copyright (c) 2020-2025 Martin Moene
//
// https://github.com/martinmoene/scope-lite
//
Expand Down Expand Up @@ -77,24 +77,21 @@
#if scope_CPP20_OR_GREATER && defined(__has_include )
# if __has_include( <scope> )
# define scope_HAVE_STD_SCOPE 1
# define scope_HAVE_EXP_SCOPE 0
# elif __has_include( <experimental/scope> )
# define scope_HAVE_STD_SCOPE 1
# define scope_HAVE_STD_SCOPE 0
# define scope_HAVE_EXP_SCOPE 1
# else
# define scope_HAVE_STD_SCOPE 0
# define scope_HAVE_EXP_SCOPE 0
# endif
#else
# define scope_HAVE_STD_SCOPE 0
# define scope_HAVE_EXP_SCOPE 0
#endif

#define scope_USES_STD_SCOPE ( (scope_CONFIG_SELECT_SCOPE == scope_SCOPE_STD) || ((scope_CONFIG_SELECT_SCOPE == scope_SCOPE_DEFAULT) && scope_HAVE_STD_SCOPE) )

//
// Using std <scope>:
//
// ToDo:
// - choose <scope> or <experimental/scope>.
// - use correct namespace in using below.
//
#define scope_USES_EXP_SCOPE ( (scope_CONFIG_SELECT_SCOPE == scope_SCOPE_STD) || ((scope_CONFIG_SELECT_SCOPE == scope_SCOPE_DEFAULT) && scope_HAVE_EXP_SCOPE) )

#if scope_USES_STD_SCOPE

Expand All @@ -113,6 +110,23 @@ namespace nonstd
using std::make_unique_resource_checked;
}

#elif scope_USES_EXP_SCOPE

#include <experimental/scope>

namespace nonstd
{
using std::experimental::scope_exit;
using std::experimental::scope_fail;
using std::experimental::scope_success;
using std::experimental::unique_resource;

using std::experimental::make_scope_exit;
using std::experimental::make_scope_fail;
using std::experimental::make_scope_success;
using std::experimental::make_unique_resource_checked;
}

#else // scope_USES_STD_SCOPE

// half-open range [lo..hi):
Expand Down