Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-10-30 14:05:50 +02:00
parent ccf08113b9
commit 8399175d8c
6 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/nel/src/3d/driver/opengl/driver_opengl.cpp
View file

@ -191,7 +191,7 @@ CDriverGL::CDriverGL()
// autorelease pool for memory management // autorelease pool for memory management
_autoreleasePool = [[NSAutoreleasePool alloc] init]; _autoreleasePool = [[NSAutoreleasePool alloc] init];
// init the application object // init the application object
[NSApplication sharedApplication]; [NSApplication sharedApplication];
@ -200,7 +200,7 @@ CDriverGL::CDriverGL()
// finish the application launching // finish the application launching
[NSApp finishLaunching]; [NSApp finishLaunching];
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
_cursor = None; _cursor = None;
@ -875,7 +875,7 @@ bool CDriverGL::swapBuffers()
// TODO: maybe do this somewhere else? // TODO: maybe do this somewhere else?
[_autoreleasePool release]; [_autoreleasePool release];
_autoreleasePool = [[NSAutoreleasePool alloc] init]; _autoreleasePool = [[NSAutoreleasePool alloc] init];
[_ctx flushBuffer]; [_ctx flushBuffer];
[containerView() display]; [containerView() display];
@ -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)
{ {

3
code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
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"

3
code/nel/src/3d/driver/opengl/unix_event_emitter.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 {

2
code/nel/src/misc/debug.cpp
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())

2
code/nel/tools/3d/object_viewer_qt/src/particle_node.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdpch.h" #include "stdpch.h"
#include "particle_node.h" #include "particle_node.h"
// NeL includes // NeL includes

2
code/nel/tools/3d/object_viewer_qt/src/particle_node.h
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;