From 2115cf19b95fa268debfbb84c741ad0468c154bb Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Sun, 6 Mar 2011 17:09:38 +0100 Subject: [PATCH] Fixed a couple of compiler warnings in minor branch --HG-- branch : minor --- src/modules/graphics/opengl/Font.cpp | 1 + src/modules/thread/sdl/Thread.cpp | 2 +- src/modules/thread/sdl/wrap_Thread.cpp | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/opengl/Font.cpp b/src/modules/graphics/opengl/Font.cpp index 40ef5b392..c38931a23 100644 --- a/src/modules/graphics/opengl/Font.cpp +++ b/src/modules/graphics/opengl/Font.cpp @@ -265,6 +265,7 @@ namespace opengl bool Font::loadVolatile() { createTexture(); + return true; } void Font::unloadVolatile() diff --git a/src/modules/thread/sdl/Thread.cpp b/src/modules/thread/sdl/Thread.cpp index 478f79dbb..e44e2738f 100644 --- a/src/modules/thread/sdl/Thread.cpp +++ b/src/modules/thread/sdl/Thread.cpp @@ -118,7 +118,7 @@ namespace sdl } ThreadData::ThreadData(const char *name, size_t len, const char *code, void *mutex, void *cond) - : mutex(mutex), cond(cond), len(len) + : len(len), mutex(mutex), cond(cond) { this->name = new char[len+1]; memset(this->name, 0, len+1); diff --git a/src/modules/thread/sdl/wrap_Thread.cpp b/src/modules/thread/sdl/wrap_Thread.cpp index 25409c773..37cd75f1f 100644 --- a/src/modules/thread/sdl/wrap_Thread.cpp +++ b/src/modules/thread/sdl/wrap_Thread.cpp @@ -285,7 +285,6 @@ namespace sdl luax_convobj(L, 2, "filesystem", "newFile"); if (luax_istype(L, 2, FILESYSTEM_FILE_T)) { - Data * d; try { data = luax_checktype(L, 2, "File", FILESYSTEM_FILE_T)->read(); } catch (love::Exception & e) {