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

Merge remote-tracking branch 'feature/boost-optional/boost-optional' into develop

Browse Source
This commit is contained in:
ThePhD 2016-06-06 15:48:32 -04:00
commit 53bed40bc5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sol/optional.hpp
View File

@ -24,6 +24,8 @@
#if __cplusplus > 201402L #if __cplusplus > 201402L
#include <optional> #include <optional>
#elif defined(SOL_USE_BOOST)
#include <boost/optional.hpp>
#else #else
#include "../Optional/optional.hpp" #include "../Optional/optional.hpp"
#endif // C++ 14 #endif // C++ 14
@ -35,6 +37,11 @@ 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::nullopt; constexpr nullopt_t nullopt = std::nullopt;
#elif defined(SOL_USE_BOOST)
template <typename T>
using optional = boost::optional<T>;
using nullopt_t = boost::none_t;
const nullopt_t nullopt = boost::none;
#else #else
#endif // C++ 14 #endif // C++ 14
} }