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

inline constexpr to stop odr issues

Browse Source
This commit is contained in:
ThePhD 2019-05-26 16:12:21 -04:00
parent ca293c723f
commit e814868a24
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sol/types.hpp
View File

@ -97,7 +97,7 @@ namespace sol {
} // namespace detail } // namespace detail
struct lua_nil_t {}; 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) { inline bool operator==(lua_nil_t, lua_nil_t) {
return true; return true;
} }
@ -106,7 +106,7 @@ namespace sol {
} }
#if !defined(SOL_NO_NIL) || (SOL_NO_NIL == 0) #if !defined(SOL_NO_NIL) || (SOL_NO_NIL == 0)
using nil_t = lua_nil_t; using nil_t = lua_nil_t;
constexpr const nil_t& nil = lua_nil; inline constexpr const nil_t& nil = lua_nil;
#endif #endif
namespace detail { namespace detail {

4
single/include/sol/forward.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script. // This file was generated with a script.
// Generated 2019-05-26 19:43:41.438672 UTC // Generated 2019-05-26 20:12:02.301827 UTC
// This header was generated with sol v3.0.2 (revision fe5c71e) // This header was generated with sol v3.0.2 (revision ca293c7)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP #ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP

8
single/include/sol/sol.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script. // This file was generated with a script.
// Generated 2019-05-26 19:43:41.120525 UTC // Generated 2019-05-26 20:12:01.997640 UTC
// This header was generated with sol v3.0.2 (revision fe5c71e) // This header was generated with sol v3.0.2 (revision ca293c7)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -6288,7 +6288,7 @@ namespace sol {
} // namespace detail } // namespace detail
struct lua_nil_t {}; 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) { inline bool operator==(lua_nil_t, lua_nil_t) {
return true; return true;
} }
@ -6297,7 +6297,7 @@ namespace sol {
} }
#if !defined(SOL_NO_NIL) || (SOL_NO_NIL == 0) #if !defined(SOL_NO_NIL) || (SOL_NO_NIL == 0)
using nil_t = lua_nil_t; using nil_t = lua_nil_t;
constexpr const nil_t& nil = lua_nil; inline constexpr const nil_t& nil = lua_nil;
#endif #endif
namespace detail { namespace detail {