mirror of
https://github.com/ThePhD/sol2.git
synced 2024-03-22 13:10:44 +08:00
inline constexpr to stop odr issues
This commit is contained in:
parent
ca293c723f
commit
e814868a24
|
@ -97,7 +97,7 @@ namespace sol {
|
|||
} // namespace detail
|
||||
|
||||
struct lua_nil_t {};
|
||||
constexpr lua_nil_t lua_nil{};
|
||||
inline constexpr lua_nil_t lua_nil{};
|
||||
inline bool operator==(lua_nil_t, lua_nil_t) {
|
||||
return true;
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ namespace sol {
|
|||
}
|
||||
#if !defined(SOL_NO_NIL) || (SOL_NO_NIL == 0)
|
||||
using nil_t = lua_nil_t;
|
||||
constexpr const nil_t& nil = lua_nil;
|
||||
inline constexpr const nil_t& nil = lua_nil;
|
||||
#endif
|
||||
|
||||
namespace detail {
|
||||
|
|
|
@ -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 2019-05-26 19:43:41.438672 UTC
|
||||
// This header was generated with sol v3.0.2 (revision fe5c71e)
|
||||
// Generated 2019-05-26 20:12:02.301827 UTC
|
||||
// This header was generated with sol v3.0.2 (revision ca293c7)
|
||||
// https://github.com/ThePhD/sol2
|
||||
|
||||
#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP
|
||||
|
|
|
@ -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 2019-05-26 19:43:41.120525 UTC
|
||||
// This header was generated with sol v3.0.2 (revision fe5c71e)
|
||||
// Generated 2019-05-26 20:12:01.997640 UTC
|
||||
// This header was generated with sol v3.0.2 (revision ca293c7)
|
||||
// https://github.com/ThePhD/sol2
|
||||
|
||||
#ifndef SOL_SINGLE_INCLUDE_HPP
|
||||
|
@ -6288,7 +6288,7 @@ namespace sol {
|
|||
} // namespace detail
|
||||
|
||||
struct lua_nil_t {};
|
||||
constexpr lua_nil_t lua_nil{};
|
||||
inline constexpr lua_nil_t lua_nil{};
|
||||
inline bool operator==(lua_nil_t, lua_nil_t) {
|
||||
return true;
|
||||
}
|
||||
|
@ -6297,7 +6297,7 @@ namespace sol {
|
|||
}
|
||||
#if !defined(SOL_NO_NIL) || (SOL_NO_NIL == 0)
|
||||
using nil_t = lua_nil_t;
|
||||
constexpr const nil_t& nil = lua_nil;
|
||||
inline constexpr const nil_t& nil = lua_nil;
|
||||
#endif
|
||||
|
||||
namespace detail {
|
||||
|
|
Loading…
Reference in New Issue
Block a user