From cbce7633d6bbc3a862de21d7ac01c332886269d9 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 3 Nov 2010 13:45:08 +0100 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- code/nel/src/3d/driver/opengl/unix_event_emitter.cpp | 2 +- code/nel/src/3d/driver/opengl/unix_event_emitter.h | 2 ++ .../georges_editor_qt/src/georges_treeview_dialog.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp index 87d0f7a6f..343e6e247 100644 --- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp +++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp @@ -780,7 +780,7 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server) createIM(); break; case ClientMessage: - if ((event.xclient.format == 32) && (event.xclient.data.l[0] == XA_WM_DELETE_WINDOW)) + if ((event.xclient.format == 32) && ((Atom)event.xclient.data.l[0] == XA_WM_DELETE_WINDOW)) { server->postEvent(new CEventDestroyWindow(this)); } diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.h b/code/nel/src/3d/driver/opengl/unix_event_emitter.h index b42f45fb4..1ca017cf0 100644 --- a/code/nel/src/3d/driver/opengl/unix_event_emitter.h +++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.h @@ -22,6 +22,8 @@ #include "nel/misc/events.h" #include "nel/misc/game_device_events.h" +#include "nel/3d/driver.h" + #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC) #include diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp index 8f9087885..3eb02e301 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp @@ -231,7 +231,7 @@ namespace NLQT } else { //if (!file.open()) - nlerror("Can't open the file %s for writing.", s); + nlerror("Can't open the file %s for writing.", s.c_str()); } }