From 29bc9970c2b8851317aeb40f62a6ca92569d20bc Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Wed, 12 May 2010 11:12:19 +0200
Subject: [PATCH] Fixed: #885 luabind (On Windows Breaks Compiling)

---
 .../client/src/interface_v3/lua_helper.cpp    |  4 +++
 .../ryzom/client/src/interface_v3/lua_ihm.cpp | 32 +++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/code/ryzom/client/src/interface_v3/lua_helper.cpp b/code/ryzom/client/src/interface_v3/lua_helper.cpp
index bb02a3510..d7d48d122 100644
--- a/code/ryzom/client/src/interface_v3/lua_helper.cpp
+++ b/code/ryzom/client/src/interface_v3/lua_helper.cpp
@@ -31,6 +31,10 @@ extern "C"
 #include "lualib.h"
 }
 
+// to get rid of you_must_not_use_assert___use_nl_assert___read_debug_h_file messages
+#include <cassert>
+#undef assert
+#define assert nlassert
 #include <luabind/luabind.hpp>
 
 using namespace std;
diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.cpp b/code/ryzom/client/src/interface_v3/lua_ihm.cpp
index 59a6fdff3..2d77d8463 100644
--- a/code/ryzom/client/src/interface_v3/lua_ihm.cpp
+++ b/code/ryzom/client/src/interface_v3/lua_ihm.cpp
@@ -25,19 +25,6 @@
 #    undef for
 #  endif
 #endif
-#include <luabind/luabind.hpp>
-
-#if LUABIND_MAX_ARITY == 10
-#	define LUABIND_VERSION 07
-#elif LUABIND_MAX_ARITY == 5
-#	define LUABIND_VERSION 06
-#else
-#	pragma error("luabind version not recognized")
-#endif
-
-#if LUABIND_VERSION == 07
-#	include <luabind/operator.hpp>
-#endif
 
 #include "lua_ihm.h"
 #include "reflect.h"
@@ -96,7 +83,6 @@
 #include "game_share/bg_downloader_msg.h"
 #include "game_share/constants.h"
 
-
 #ifdef LUA_NEVRAX_VERSION
 	#include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger
 #endif
@@ -114,6 +100,24 @@ Compilation is VERY SLOW
 */
 // ***************************************************************************
 
+// to get rid of you_must_not_use_assert___use_nl_assert___read_debug_h_file messages
+#include <cassert>
+#undef assert
+#define assert nlassert
+#include <luabind/luabind.hpp>
+
+#if LUABIND_MAX_ARITY == 10
+#	define LUABIND_VERSION 07
+#elif LUABIND_MAX_ARITY == 5
+#	define LUABIND_VERSION 06
+#else
+#	pragma error("luabind version not recognized")
+#endif
+
+#if LUABIND_VERSION == 07
+#	include <luabind/operator.hpp>
+#endif
+
 using namespace NLMISC;
 using namespace NLGEORGES;
 using namespace R2;