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

Merge pull request #1336 from raistlin/FixSomeWarnings

Browse source 
Fixed some minor compiler warnings on Linux
This commit is contained in:
Daniel Buckmaster 2015-07-01 22:45:21 +10:00
commit 9bf6e0f8f4
5 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/lib/collada/src/dae/daeStringTable.cpp
View file

@ -58,7 +58,7 @@ void daeStringTable::clear()
{ {
unsigned int i; unsigned int i;
for (i=0;i<_stringBuffersList.getCount();i++) for (i=0;i<_stringBuffersList.getCount();i++)
#if _MSC_VER <= 1200 #if defined(_MSC_VER) && (_MSC_VER <= 1200)
delete [] (char *) _stringBuffersList[i]; delete [] (char *) _stringBuffersList[i];
#else #else
delete [] _stringBuffersList[i]; delete [] _stringBuffersList[i];

8
Engine/lib/convexDecomp/NvSimpleTypes.h
View file

@ -87,7 +87,7 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
typedef float NxF32; typedef float NxF32;
typedef double NxF64; typedef double NxF64;
#elif LINUX #elif defined(LINUX)
typedef long long NxI64; typedef long long NxI64;
typedef signed int NxI32; typedef signed int NxI32;
typedef signed short NxI16; typedef signed short NxI16;
@ -101,7 +101,7 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
typedef float NxF32; typedef float NxF32;
typedef double NxF64; typedef double NxF64;
#elif __APPLE__ #elif defined(__APPLE__)
typedef long long NxI64; typedef long long NxI64;
typedef signed int NxI32; typedef signed int NxI32;
typedef signed short NxI16; typedef signed short NxI16;
@ -115,7 +115,7 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
typedef float NxF32; typedef float NxF32;
typedef double NxF64; typedef double NxF64;
#elif __CELLOS_LV2__ #elif defined(__CELLOS_LV2__)
typedef long long NxI64; typedef long long NxI64;
typedef signed int NxI32; typedef signed int NxI32;
typedef signed short NxI16; typedef signed short NxI16;
@ -129,7 +129,7 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
typedef float NxF32; typedef float NxF32;
typedef double NxF64; typedef double NxF64;
#elif _XBOX #elif defined(_XBOX)
typedef __int64 NxI64; typedef __int64 NxI64;
typedef signed int NxI32; typedef signed int NxI32;
typedef signed short NxI16; typedef signed short NxI16;

8
Engine/source/core/strings/stringFunctions.h
View file

@ -36,10 +36,12 @@
// These standard functions are not defined on Win32 and other Microsoft platforms... // These standard functions are not defined on Win32 and other Microsoft platforms...
#define strcasecmp _stricmp #define strcasecmp _stricmp
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#endif
#if (_MSC_VER < 1800) && (defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)) #if _MSC_VER < 1800
#define strtof (float)strtod #define strtof (float)strtod
#endif #endif // _MSC_VER < 1800
#endif // defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

5
Engine/source/core/util/FastDelegate.h
View file

@ -47,10 +47,9 @@
#ifndef FASTDELEGATE_H #ifndef FASTDELEGATE_H
#define FASTDELEGATE_H #define FASTDELEGATE_H
#if _MSC_VER > 1000 #if defined(_MSC_VER) && (_MSC_VER > 1000)
#pragma once #pragma once
#endif // _MSC_VER > 1000 #endif // defined(_MSC_VER) && (_MSC_VER > 1000)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Configuration options // Configuration options

2
Engine/source/platform/types.gcc.h
View file

@ -30,7 +30,7 @@
//-------------------------------------- //--------------------------------------
// Types // Types
#if TORQUE_X86 #if defined(TORQUE_X86)
typedef signed long long S64; typedef signed long long S64;
typedef unsigned long long U64; typedef unsigned long long U64;
#else #else