diff --git a/nel/src/gui/lua_helper.cpp b/nel/src/gui/lua_helper.cpp index bb5fd5426..ed4106144 100644 --- a/nel/src/gui/lua_helper.cpp +++ b/nel/src/gui/lua_helper.cpp @@ -42,6 +42,12 @@ #define assert(x) #endif +// Always use unique_ptr with ValyriaTear/luabind on Ubuntu 20, +// since the setting is not stored in build_information.hpp +#ifndef LUABIND_USE_CXX11 +#define LUABIND_USE_CXX11 +#endif + #include #include #include diff --git a/nel/src/gui/lua_ihm.cpp b/nel/src/gui/lua_ihm.cpp index 7ea3d3887..229cd1f0f 100644 --- a/nel/src/gui/lua_ihm.cpp +++ b/nel/src/gui/lua_ihm.cpp @@ -48,6 +48,12 @@ # define assert(x) #endif +// Always use unique_ptr with ValyriaTear/luabind on Ubuntu 20, +// since the setting is not stored in build_information.hpp +#ifndef LUABIND_USE_CXX11 +#define LUABIND_USE_CXX11 +#endif + #include // in luabind > 0.6, LUABIND_MAX_ARITY is set to 10 #if LUABIND_MAX_ARITY == 10 diff --git a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp index 179f782d9..d988bad18 100644 --- a/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp +++ b/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp @@ -41,6 +41,12 @@ # define assert(x) #endif +// Always use unique_ptr with ValyriaTear/luabind on Ubuntu 20, +// since the setting is not stored in build_information.hpp +#ifndef LUABIND_USE_CXX11 +#define LUABIND_USE_CXX11 +#endif + #include // in luabind > 0.6, LUABIND_MAX_ARITY is set to 10 #if LUABIND_MAX_ARITY == 10 diff --git a/ryzom/tools/leveldesign/variable_parser/lua_helper.cpp b/ryzom/tools/leveldesign/variable_parser/lua_helper.cpp index 2bb462664..bca003d6a 100644 --- a/ryzom/tools/leveldesign/variable_parser/lua_helper.cpp +++ b/ryzom/tools/leveldesign/variable_parser/lua_helper.cpp @@ -30,6 +30,13 @@ extern "C" #include #undef assert #define assert nlassert + +// Always use unique_ptr with ValyriaTear/luabind on Ubuntu 20, +// since the setting is not stored in build_information.hpp +#ifndef LUABIND_USE_CXX11 +#define LUABIND_USE_CXX11 +#endif + #include using namespace std;