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

Support constexpr boost::none with recent Boost versions. #1129

Merged
merged 1 commit into from
Feb 10, 2021
Merged

Support constexpr boost::none with recent Boost versions. #1129

Show file tree
Hide file tree
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
18 changes: 15 additions & 3 deletions include/sol/optional.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
#include <sol/traits.hpp>
#if SOL_IS_ON(SOL_USE_BOOST_I_)
#include <boost/optional.hpp>

#include <boost/version.hpp>
#if BOOST_VERSION >= 107500 // Since Boost 1.75.0 boost::none is constexpr
#define COULD_BE_CONSTEXPR constexpr
#else
#define COULD_BE_CONSTEXPR const
#endif // BOOST_VERSION

#else
#include <sol/optional_implementation.hpp>
#endif // Boost vs. Better optional
Expand All @@ -41,7 +49,7 @@ namespace sol {
template <typename T>
using optional = boost::optional<T>;
using nullopt_t = boost::none_t;
const nullopt_t nullopt = boost::none;
COULD_BE_CONSTEXPR nullopt_t nullopt = boost::none;
#endif // Boost vs. Better optional

namespace meta {
Expand All @@ -61,18 +69,22 @@ namespace sol {
#if SOL_IS_ON(SOL_USE_BOOST_I_)
template <typename T>
struct associated_nullopt<boost::optional<T>> {
inline static const boost::none_t value = boost::none;
inline static COULD_BE_CONSTEXPR boost::none_t value = boost::none;
};
#endif // Boost nullopt

#if SOL_IS_ON(SOL_USE_BOOST_I_)
template <typename T>
inline const auto associated_nullopt_v = associated_nullopt<T>::value;
inline COULD_BE_CONSTEXPR auto associated_nullopt_v = associated_nullopt<T>::value;
#else
template <typename T>
inline constexpr auto associated_nullopt_v = associated_nullopt<T>::value;
#endif // Boost continues to lag behind, to not many people's surprise...
} // namespace detail
} // namespace sol

#if SOL_IS_ON(SOL_USE_BOOST_I_)
#undef COULD_BE_CONSTEXPR
#endif

#endif // SOL_OPTIONAL_HPP
4 changes: 2 additions & 2 deletions single/include/sol/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// This file was generated with a script.
// Generated 2021-02-03 01:36:37.733271 UTC
// This header was generated with sol v3.2.3 (revision 22ecd349)
// Generated 2021-02-10 17:29:50.720589 UTC
// This header was generated with sol v3.2.3 (revision b77f1a21)
// https://github.com/ThePhD/sol2

#ifndef SOL_SINGLE_CONFIG_HPP
Expand Down
4 changes: 2 additions & 2 deletions single/include/sol/forward.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// This file was generated with a script.
// Generated 2021-02-03 01:36:37.666578 UTC
// This header was generated with sol v3.2.3 (revision 22ecd349)
// Generated 2021-02-10 17:29:50.717841 UTC
// This header was generated with sol v3.2.3 (revision b77f1a21)
// https://github.com/ThePhD/sol2

#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP
Expand Down
22 changes: 17 additions & 5 deletions single/include/sol/sol.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// This file was generated with a script.
// Generated 2021-02-03 01:36:36.756148 UTC
// This header was generated with sol v3.2.3 (revision 22ecd349)
// Generated 2021-02-10 17:29:50.610143 UTC
// This header was generated with sol v3.2.3 (revision b77f1a21)
// https://github.com/ThePhD/sol2

#ifndef SOL_SINGLE_INCLUDE_HPP
Expand Down Expand Up @@ -4131,6 +4131,14 @@ namespace sol {

#if SOL_IS_ON(SOL_USE_BOOST_I_)
#include <boost/optional.hpp>

#include <boost/version.hpp>
#if BOOST_VERSION >= 107500 // Since Boost 1.75.0 boost::none is constexpr
#define COULD_BE_CONSTEXPR constexpr
#else
#define COULD_BE_CONSTEXPR const
#endif // BOOST_VERSION

#else
// beginning of sol/optional_implementation.hpp

Expand Down Expand Up @@ -6373,7 +6381,7 @@ namespace sol {
template <typename T>
using optional = boost::optional<T>;
using nullopt_t = boost::none_t;
const nullopt_t nullopt = boost::none;
COULD_BE_CONSTEXPR nullopt_t nullopt = boost::none;
#endif // Boost vs. Better optional

namespace meta {
Expand All @@ -6393,20 +6401,24 @@ namespace sol {
#if SOL_IS_ON(SOL_USE_BOOST_I_)
template <typename T>
struct associated_nullopt<boost::optional<T>> {
inline static const boost::none_t value = boost::none;
inline static COULD_BE_CONSTEXPR boost::none_t value = boost::none;
};
#endif // Boost nullopt

#if SOL_IS_ON(SOL_USE_BOOST_I_)
template <typename T>
inline const auto associated_nullopt_v = associated_nullopt<T>::value;
inline COULD_BE_CONSTEXPR auto associated_nullopt_v = associated_nullopt<T>::value;
#else
template <typename T>
inline constexpr auto associated_nullopt_v = associated_nullopt<T>::value;
#endif // Boost continues to lag behind, to not many people's surprise...
} // namespace detail
} // namespace sol

#if SOL_IS_ON(SOL_USE_BOOST_I_)
#undef COULD_BE_CONSTEXPR
#endif

// end of sol/optional.hpp

// beginning of sol/raii.hpp
Expand Down