Changed: #825 Remove all warning when compiling Ryzom

This commit is contained in:
kervala 2010-10-30 14:05:50 +02:00
parent 1a484e8c4b
commit 4c12fbb058
6 changed files with 8 additions and 11 deletions

View file

@ -2077,6 +2077,7 @@ void CDriverGL::setSwapVBLInterval(uint interval)
uint CDriverGL::getSwapVBLInterval() uint CDriverGL::getSwapVBLInterval()
{ {
H_AUTO_OGL(CDriverGL_getSwapVBLInterval) H_AUTO_OGL(CDriverGL_getSwapVBLInterval)
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
if(_Extensions.WGLEXTSwapControl) if(_Extensions.WGLEXTSwapControl)
{ {

View file

@ -22,8 +22,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <GL/gl.h> #include <X11/Xutil.h>
#include <GL/glx.h>
#include "nel/misc/debug.h" #include "nel/misc/debug.h"

View file

@ -24,8 +24,7 @@
#if defined(NL_OS_UNIX) && !defined(NL_OS_MAC) #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
#include <GL/gl.h> #include <X11/Xlib.h>
#include <GL/glx.h>
namespace NLMISC { namespace NLMISC {

View file

@ -1147,11 +1147,9 @@ void destroyDebug()
void createDebug (const char *logPath, bool logInFile, bool eraseLastLog) void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
{ {
// Do some basic compiler time check on type size // Do some basic compiler time check on type size
nlctassert(sizeof(char) == 1); nlctassert(sizeof(char) == 1);
// static bool alreadyCreateSharedAmongThreads = false; // static bool alreadyCreateSharedAmongThreads = false;
// if ( !alreadyCreateSharedAmongThreads ) // if ( !alreadyCreateSharedAmongThreads )
if (!INelContext::getInstance().getAlreadyCreateSharedAmongThreads()) if (!INelContext::getInstance().getAlreadyCreateSharedAmongThreads())

View file

@ -274,7 +274,7 @@ private:
TNodeVect _Nodes; TNodeVect _Nodes;
// path + name of workspace // path + name of workspace
std::string _Filename; std::string _Filename;
bool _Modified; bool _Modified;
IModificationCallback *_ModificationCallback; IModificationCallback *_ModificationCallback;
// workspace user name // workspace user name
std::string _Name; std::string _Name;