gcc 4.1 compile fixes.
This commit is contained in:
parent
030db5bb23
commit
785c016a28
7 changed files with 16 additions and 8 deletions
|
@ -56,12 +56,12 @@
|
||||||
int FixP_Alpha
|
int FixP_Alpha
|
||||||
);
|
);
|
||||||
|
|
||||||
struct r2pos TextReportGadget :: GetPos_Rel
|
struct r2pos GetPos_Rel
|
||||||
(
|
(
|
||||||
const struct r2rect& R2Rect_Parent
|
const struct r2rect& R2Rect_Parent
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
r2size TextReportGadget :: GetSize
|
r2size GetSize
|
||||||
(
|
(
|
||||||
const struct r2rect& R2Rect_Parent
|
const struct r2rect& R2Rect_Parent
|
||||||
) const;
|
) const;
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
|
|
||||||
#include "hierchnk.hpp"
|
#include "hierchnk.hpp"
|
||||||
|
|
||||||
|
class File_Chunk;
|
||||||
|
|
||||||
// project specifc structure contained in rif handle
|
// project specifc structure contained in rif handle
|
||||||
struct Project_RifHandle {};
|
struct Project_RifHandle {};
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,7 @@ struct AltTabEntry
|
||||||
inline bool operator != (AltTabEntry const & rEntry) const
|
inline bool operator != (AltTabEntry const & rEntry) const
|
||||||
{ return ! operator == (rEntry); }
|
{ return ! operator == (rEntry); }
|
||||||
|
|
||||||
friend inline HashFunction(AltTabEntry const & rEntry)
|
friend inline unsigned HashFunction(AltTabEntry const & rEntry)
|
||||||
{ return HashFunction(rEntry.m_pDxGraphic); }
|
{ return HashFunction(rEntry.m_pDxGraphic); }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
#include "bmpnames.hpp"
|
#include "bmpnames.hpp"
|
||||||
#include "projload.hpp"
|
#include "projload.hpp"
|
||||||
|
|
||||||
|
class Sprite_Header_Chunk;
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
extern BOOL copy_to_mainshpl (Shape_Chunk *shape, int list_pos);
|
extern BOOL copy_to_mainshpl (Shape_Chunk *shape, int list_pos);
|
||||||
extern BOOL copy_to_mainshpl (Shape_Sub_Shape_Chunk *shape, int list_pos);
|
extern BOOL copy_to_mainshpl (Shape_Sub_Shape_Chunk *shape, int list_pos);
|
||||||
|
|
|
@ -365,7 +365,7 @@ public:
|
||||||
virtual void fill_data_block_for_process(char * data_start);
|
virtual void fill_data_block_for_process(char * data_start);
|
||||||
|
|
||||||
|
|
||||||
Chunk* Chunk_With_Children::DynCreate(const char* data);
|
Chunk* DynCreate(const char* data);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
#include "palette.h"
|
#include "palette.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
class Environment_Data_Chunk;
|
||||||
|
|
||||||
static const unsigned char * grab_pixel_data(int ssize, unsigned char const * sdata)
|
static const unsigned char * grab_pixel_data(int ssize, unsigned char const * sdata)
|
||||||
{
|
{
|
||||||
if (!ssize) return 0;
|
if (!ssize) return 0;
|
||||||
|
|
|
@ -219,12 +219,14 @@ namespace IFF
|
||||||
|
|
||||||
} // namespace IFF
|
} // namespace IFF
|
||||||
|
|
||||||
inline unsigned HashFunction(IFF::RegEntry const & rEntry)
|
|
||||||
{
|
|
||||||
return HashFunction(rEntry.m_idChunk.m_nID);
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace IFF {
|
namespace IFF {
|
||||||
|
|
||||||
|
inline unsigned HashFunction(IFF::RegEntry const & rEntry)
|
||||||
|
{
|
||||||
|
return ::HashFunction(rEntry.m_idChunk.m_nID);
|
||||||
|
}
|
||||||
|
|
||||||
static ::HashTable<RegEntry> * g_pRegister = NULL;
|
static ::HashTable<RegEntry> * g_pRegister = NULL;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue