Commit 438baffc authored by hybrid's avatar hybrid

Fix some warnings from recent gcc versions.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3852 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 6296a1c1
...@@ -60,7 +60,7 @@ namespace scene ...@@ -60,7 +60,7 @@ namespace scene
ECOF_TRANSPARENT_EMISSIVE = 8, ECOF_TRANSPARENT_EMISSIVE = 8,
//! Write specular material color as transparent //! Write specular material color as transparent
ECOF_TRANSPARENT_SPECULAR = 16, ECOF_TRANSPARENT_SPECULAR = 16
}; };
//! Callback interface for properties which can be used to influence collada writing //! Callback interface for properties which can be used to influence collada writing
......
...@@ -264,7 +264,7 @@ public: ...@@ -264,7 +264,7 @@ public:
core::dimension2d<s32> text_dimension; core::dimension2d<s32> text_dimension;
// When we use the "tab" hack, disable right-alignment, it messes up everything // When we use the "tab" hack, disable right-alignment, it messes up everything
bool has_tab = (text.findFirst(L'\t') != -1); // bool has_tab = (text.findFirst(L'\t') != -1);
// ---- collect character locations // ---- collect character locations
const unsigned int text_size = text.size(); const unsigned int text_size = text.size();
core::array<s32> indices(text_size); core::array<s32> indices(text_size);
......
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
#include "irrlicht.h" #include "irrlicht.h"
#include <assert.h> #include <assert.h>
#define TestWithAllDrivers(X, ...) \ #define TestWithAllDrivers(X) \
logTestString("Running test " #X "\n"); \ logTestString("Running test " #X "\n"); \
for (u32 i=1; i<video::EDT_COUNT; ++i) \ for (u32 i=1; i<video::EDT_COUNT; ++i) \
result &= X(video::E_DRIVER_TYPE(i), ##__VA_ARGS__) result &= X(video::E_DRIVER_TYPE(i))
#define TestWithAllHWDrivers(X, ...) \ #define TestWithAllHWDrivers(X) \
logTestString("Running test " #X "\n"); \ logTestString("Running test " #X "\n"); \
for (u32 i=video::EDT_DIRECT3D8; i<video::EDT_COUNT; ++i) \ for (u32 i=video::EDT_DIRECT3D8; i<video::EDT_COUNT; ++i) \
result &= X(video::E_DRIVER_TYPE(i), ##__VA_ARGS__) result &= X(video::E_DRIVER_TYPE(i))
//! Compare two files //! Compare two files
/** \param fileName1 The first file for comparison. /** \param fileName1 The first file for comparison.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment