TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed building on GCC 4.7.x

Browse source
This commit is contained in:
bank 2012-09-30 02:32:31 +04:00
parent d2700f881c
commit 12dbf49533
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/platform/platform.h
View file

@ -523,17 +523,17 @@ template<class T,class S> void dCopyArray(T *dst, const S *src, dsize_t size)
dst[i] = (T)src[i]; dst[i] = (T)src[i];
} }
extern void* dMemcpy(void *dst, const void *src, dsize_t size);
extern void* dMemmove(void *dst, const void *src, dsize_t size);
extern void* dMemset(void *dst, int c, dsize_t size);
extern int dMemcmp(const void *ptr1, const void *ptr2, dsize_t size);
// Special case of the above function when the arrays are the same type (use memcpy) // Special case of the above function when the arrays are the same type (use memcpy)
template<class T> void dCopyArray(T *dst, const T *src, dsize_t size) template<class T> void dCopyArray(T *dst, const T *src, dsize_t size)
{ {
dMemcpy(dst, src, size * sizeof(T)); dMemcpy(dst, src, size * sizeof(T));
} }
extern void* dMemcpy(void *dst, const void *src, dsize_t size);
extern void* dMemmove(void *dst, const void *src, dsize_t size);
extern void* dMemset(void *dst, int c, dsize_t size);
extern int dMemcmp(const void *ptr1, const void *ptr2, dsize_t size);
/// The dALIGN macro ensures the passed declaration is /// The dALIGN macro ensures the passed declaration is
/// data aligned at 16 byte boundaries. /// data aligned at 16 byte boundaries.
#if defined( TORQUE_COMPILER_VISUALC ) #if defined( TORQUE_COMPILER_VISUALC )

3
Engine/source/ts/tsShapeConstruct.h
View file

@ -38,6 +38,9 @@
#ifndef _COLLADA_UTILS_H_ #ifndef _COLLADA_UTILS_H_
#include "ts/collada/colladaUtils.h" #include "ts/collada/colladaUtils.h"
#endif #endif
#ifndef _ENGINEAPI_H_
#include "console/engineAPI.h"
#endif
/// This class allows an artist to export their animations for the model /// This class allows an artist to export their animations for the model
/// into the .dsq format. This class in particular matches up the model /// into the .dsq format. This class in particular matches up the model