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

detect C++17 mode in MSVC #3555

Merged
merged 3 commits into from
Oct 29, 2023
Merged

detect C++17 mode in MSVC #3555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76e1e63
detect C++17 mode in MSVC
conradsnicta Oct 28, 2023
36e496b
update HISTORY.md
conradsnicta Oct 28, 2023
fb7e29f
simplify to only one option
conradsnicta Oct 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions HISTORY.md
View file
Open in desktop
Expand Up @@ -6,6 +6,8 @@

* Use HTTPS for all auto-downloaded dependencies (#3550).

* More robust detection of C++17 mode in the MSVC "compiler" (#3555).

### mlpack 4.2.1
###### 2023-09-05
* Reinforcement Learning: Gaussian noise (#3515).
Expand Down
37 changes: 25 additions & 12 deletions src/mlpack/base.hpp
View file
Open in desktop
Expand Up @@ -68,23 +68,36 @@
#define mlpack_force_inline __forceinline
#endif

// Backport std::any from C+17 to C++11 to replace boost::any.
// Use mnmlstc backport implementation only if compiler does not
// support C++17.
#if __cplusplus < 201703L && !defined(_MSC_VER)
#include <mlpack/core/std_backport/any.hpp>
#include <mlpack/core/std_backport/string_view.hpp>
#define MLPACK_ANY core::v2::any
#define MLPACK_ANY_CAST core::v2::any_cast
#define MLPACK_STRING_VIEW core::v2::string_view
#elif __cplusplus < 201703L && defined(_MSC_VER)
#error "When using Visual Studio, mlpack should be compiled with /Zc:__cplusplus and /std:c++17 or newer."
#else
// detect C++17 mode
#if (__cplusplus >= 201703L)
#undef MLPACK_HAVE_CXX17
#define MLPACK_HAVE_CXX17
#endif

#if defined(_MSVC_LANG)
#if (_MSVC_LANG >= 201703L)
#undef MLPACK_HAVE_CXX17
#define MLPACK_HAVE_CXX17
#endif
#endif

#if defined(MLPACK_HAVE_CXX17)
#include <any>
#include <string_view>
#define MLPACK_ANY std::any
#define MLPACK_ANY_CAST std::any_cast
#define MLPACK_STRING_VIEW std::string_view
#elif defined(_MSC_VER)
#error "When using Visual Studio, mlpack should be compiled with /std:c++17 or newer."
#else
// Backport std::any from C+17 to C++11 to replace boost::any.
// Use mnmlstc backport implementation only if compiler does not
// support C++17.
#include <mlpack/core/std_backport/any.hpp>
#include <mlpack/core/std_backport/string_view.hpp>
#define MLPACK_ANY core::v2::any
#define MLPACK_ANY_CAST core::v2::any_cast
#define MLPACK_STRING_VIEW core::v2::string_view
#endif

// Now include Armadillo through the special mlpack extensions.
Expand Down