paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Mac OS X Compat

Browse Source 
LightEnv - has byte order marks
Texture - conv from int to GLint wasn't allowed
JSConversion - to use isfinite you need the std:: namespace
	(this is temporary... atm I don't know why you can't call isfinite)
ScriptableComplex - when implementing methods it did not like default
values (they were removed from the cpp file)
timer.h - simple change

This was SVN commit r4231.
This commit is contained in:
dave 2006-08-19 20:24:49 +00:00
parent a20db60354
commit 98697b4676
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/graphics/LightEnv.cpp
View File

@ -1,4 +1,4 @@
/**
/**
* =========================================================================
* File : LightEnv.cpp
* Project : Pyrogenesis

2
source/graphics/TextureEntry.cpp
View File

@ -103,7 +103,7 @@ void CTextureEntry::BuildBaseColor()
// jw: this is horribly inefficient (taking 750ms for 10 texture types),
// but it is no longer called, since terrain XML files are supposed to
// include a minimap color attribute. therefore, leave it as-is.
int width,height;
GLint width,height;
glGetTexLevelParameteriv(GL_TEXTURE_2D,0,GL_TEXTURE_WIDTH,&width);
glGetTexLevelParameteriv(GL_TEXTURE_2D,0,GL_TEXTURE_HEIGHT,&height);

1
source/lib/sysdep/sysdep.h
View File

@ -146,7 +146,6 @@ extern void* alloca(size_t size);
//# define signbit
#endif
// C99 restrict
// .. for some reason, g++-3.3 claims to support C99 (according to
// __STDC_VERSION__) but doesn't have the restrict keyword.

2
source/lib/timer.h
View File

@ -247,7 +247,7 @@ public:
}
~ScopeTimerAccrue<TimerImpl>()
{
TimerImpl::unit dt = impl.get_timestamp() - t0;
typename TimerImpl::unit dt = impl.get_timestamp() - t0;
timer_bill_client(tc, dt);
}

4
source/scripting/JSConversions.cpp
View File

@ -7,7 +7,7 @@
#include "ps/Player.h"
#include "simulation/EntityTemplate.h"
#include "lib/sysdep/sysdep.h" // isfinite
#include <math.h>
#include <cfloat>
// HEntity
@ -151,7 +151,7 @@ template<> jsval ToJSVal<double>( double& Native )
template<> bool ToPrimitive<double>( JSContext* cx, jsval v, double& Storage )
{
JSBool ok = JS_ValueToNumber(cx, v, &Storage);
if (ok == JS_FALSE || !isfinite( Storage ) )
if (ok == JS_FALSE || !std::isfinite( Storage ) )
return false;
return true;
}

4
source/scripting/ScriptableComplex.inl
View File

@ -675,7 +675,7 @@ JSBool CJSComplex<T, ReadOnly>::UnWatchAll( JSContext* cx, JSObject* obj, uintN
template<typename T, bool ReadOnly>
void CJSComplex<T, ReadOnly>::ScriptingInit( const char* ClassName, JSNative Constructor = NULL, uintN ConstructorMinArgs = 0 )
void CJSComplex<T, ReadOnly>::ScriptingInit( const char* ClassName, JSNative Constructor, uintN ConstructorMinArgs )
{
JSFunctionSpec* JSI_methods = new JSFunctionSpec[ m_Methods.size() + 3 ];
unsigned int MethodID;
@ -913,7 +913,7 @@ IJSComplexProperty* CJSComplex<T, ReadOnly>::HasProperty( const CStrW& PropertyN
template<typename T, bool ReadOnly>
void CJSComplex<T, ReadOnly>::FillEnumerateSet( IteratorState* it, CStrW* PropertyRoot = NULL )
void CJSComplex<T, ReadOnly>::FillEnumerateSet( IteratorState* it, CStrW* PropertyRoot)
{
PropertyTable::iterator iit;
if( PropertyRoot )