mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 05:59:16 +00:00
Code Issues Releases Wiki Activity

Some fixes to make the ever-complaining gcc 4.7 happy (hopefully)

Browse source
This commit is contained in:
fgenesis 2012-06-27 21:51:54 +02:00
parent 86bcecf5d2
commit 38501dca35
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
BBGE/Base.h
View file

@ -139,6 +139,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "math.h" #include "math.h"
#include "FileAPI.h" #include "FileAPI.h"
#ifdef BBGE_BUILD_LINUX
# include <sys/types.h>
# include <stdint.h>
#endif
// dumb win32 includes/defines cleanup // dumb win32 includes/defines cleanup
#undef GetCharWidth #undef GetCharWidth

4
ExternalLibs/ByteBuffer.h
View file

@ -240,8 +240,6 @@ public:
BB_MAKE_WRITE_OP(uint64); BB_MAKE_WRITE_OP(uint64);
BB_MAKE_WRITE_OP(float); BB_MAKE_WRITE_OP(float);
BB_MAKE_WRITE_OP(double); BB_MAKE_WRITE_OP(double);
BB_MAKE_WRITE_OP(int);
BB_MAKE_WRITE_OP(unsigned int);
ByteBuffer &operator<<(bool value) ByteBuffer &operator<<(bool value)
{ {
@ -272,8 +270,6 @@ public:
BB_MAKE_READ_OP(uint64); BB_MAKE_READ_OP(uint64);
BB_MAKE_READ_OP(float); BB_MAKE_READ_OP(float);
BB_MAKE_READ_OP(double); BB_MAKE_READ_OP(double);
BB_MAKE_READ_OP(int);
BB_MAKE_READ_OP(unsigned int);
ByteBuffer &operator>>(bool &value) ByteBuffer &operator>>(bool &value)
{ {

14
ExternalLibs/glfont2/glfont2.cpp
View file

@ -74,16 +74,14 @@ bool GLFont::Create (const char *file_name, int tex, bool loadTexture)
vfclose(fh); vfclose(fh);
#endif #endif
ByteBuffer::uint32 dummy;
// Read the header from file // Read the header from file
header.tex = tex; header.tex = tex;
bb >> dummy; // skip tex field bb.skipRead(4); // skip tex field
bb >> header.tex_width; header.tex_width = bb.read<ByteBuffer::uint32>();
bb >> header.tex_height; header.tex_height = bb.read<ByteBuffer::uint32>();
bb >> header.start_char; header.start_char = bb.read<ByteBuffer::uint32>();
bb >> header.end_char; header.end_char = bb.read<ByteBuffer::uint32>();
bb >> dummy; // skip chars field bb.skipRead(4); // skip chars field
//Allocate space for character array //Allocate space for character array
num_chars = header.end_char - header.start_char + 1; num_chars = header.end_char - header.start_char + 1;