Skip to content
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

Jump to bottom

Remove noexcept from Bootstrapper API so it can be used from C #2750

Merged
merged 2 commits into from
Jul 20, 2022
Merged

Remove noexcept from Bootstrapper API so it can be used from C #2750

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1514691
Remove noexcept from Bootstrapper API so it can be used from C
DrusTheAxe Jul 19, 2022
d73d1f7
Switch noexcept to macro-style optional support per feedback
DrusTheAxe Jul 19, 2022
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
12 changes: 9 additions & 3 deletions dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@

#include <appmodel.h>

#if defined(__cplusplus)
#define MDDBOOTSTRAP_NOEXCEPT noexcept
#else
#define MDDBOOTSTRAP_NOEXCEPT
#endif // defined(__cplusplus)

/// Options for Bootstrap initialization
typedef enum MddBootstrapInitializeOptions
{
Expand Down Expand Up @@ -48,7 +54,7 @@ DEFINE_ENUM_FLAG_OPERATORS(MddBootstrapInitializeOptions)
STDAPI MddBootstrapInitialize(
UINT32 majorMinorVersion,
PCWSTR versionTag,
PACKAGE_VERSION minVersion) noexcept;
PACKAGE_VERSION minVersion) MDDBOOTSTRAP_NOEXCEPT;

/// Initialize the calling process to use Windows App Runtime framework package.
///
Expand All @@ -68,13 +74,13 @@ STDAPI MddBootstrapInitialize2(
UINT32 majorMinorVersion,
PCWSTR versionTag,
PACKAGE_VERSION minVersion,
MddBootstrapInitializeOptions options) noexcept;
MddBootstrapInitializeOptions options) MDDBOOTSTRAP_NOEXCEPT;

/// Undo the changes made by MddBoostrapInitialize().
///
/// @warning Packages made available via MddBootstrapInitialize2() and
/// the Dynamic Dependencies API should not be used after this call.
STDAPI_(void) MddBootstrapShutdown() noexcept;
STDAPI_(void) MddBootstrapShutdown() MDDBOOTSTRAP_NOEXCEPT;

// C++ friendly APIs
#if defined(__cplusplus)
Expand Down