StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Properly directly include optional and reference it in C++17 and beyond.

Browse Source
This commit is contained in:
ThePhD 2016-03-24 15:51:04 -04:00
parent bbd018c50e
commit 4f99b99ee9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sol/optional.hpp
View File

@ -25,7 +25,7 @@
#if __cplusplus > 201402L #if __cplusplus > 201402L
#include <optional> #include <optional>
#else #else
#include "Optional/optional.hpp" #include "../Optional/optional.hpp"
#endif // C++ 14 #endif // C++ 14
namespace sol { namespace sol {
@ -34,7 +34,7 @@ namespace sol {
template <typename T> template <typename T>
using optional = sol::optional<T>; using optional = sol::optional<T>;
using nullopt_t = std::nullopt_t; using nullopt_t = std::nullopt_t;
constexpr nullopt_t nullopt = std::experimental::nullopt; constexpr nullopt_t nullopt = std::nullopt;
#else #else
#endif // C++ 14 #endif // C++ 14
} }