mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-14 06:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fix w4 warnings

Browse Source 
- add convenience macros for config_db(CFG_GET_SYS_VAL)
- VFSUtil::EnumDirEnts now uses flags instead of bool recursive
- UNUSED() for params, UNUSED2 (<- need better name) for variables
- config.h defines must be tested with #if (always defined) -> allows
detecting misspellings thanks to compiler warnings
- replace debug_assert(0) with debug_warn (its sole purpose)
- replace ScriptingHost::ValueToInt et al with ToPrimitive
- use nommgr.h to disable both mmgr and VC debug heap

This was SVN commit r2585.
This commit is contained in:
janwas
2005-08-09 15:55:44 +00:00
parent 630b375f4d
commit a69ac0dee9
115 changed files with 654 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scripting/ScriptableComplex.h
+15 -14
View File
@@ -198,7 +198,7 @@ public:
}
return( JS_FALSE );
}
static JSBool JSPrimitive( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
static JSBool JSPrimitive( JSContext* cx, JSObject* obj, uintN UNUSED(argc), jsval* UNUSED(argv), jsval* rval )
{
CJSComplexPropertyAccessor* Instance = (CJSComplexPropertyAccessor*)JS_GetPrivate( cx, obj );
if( !Instance ) return( JS_TRUE );
@@ -221,7 +221,7 @@ public:
return( JS_TRUE );
}
static JSBool JSToString( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
static JSBool JSToString( JSContext* cx, JSObject* obj, uintN UNUSED(argc), jsval* UNUSED(argv), jsval* rval )
{
CJSComplexPropertyAccessor* Instance = (CJSComplexPropertyAccessor*)JS_GetPrivate( cx, obj );
if( !Instance ) return( JS_TRUE );
@@ -287,12 +287,12 @@ public:
m_Intrinsic = true;
m_Inherited = true;
}
jsval Get( JSContext* cx, IJSComplex* owner )
jsval Get( JSContext* UNUSED(cx), IJSComplex* owner )
{
if( m_Freshen ) (owner->*m_Freshen)();
return( ToJSVal( owner->*m_Data ) );
}
void ImmediateCopy( IJSComplex* CopyTo, IJSComplex* CopyFrom, IJSComplexProperty* CopyProperty )
void ImmediateCopy( IJSComplex* UNUSED(CopyTo), IJSComplex* UNUSED(CopyFrom), IJSComplexProperty* UNUSED(CopyProperty) )
{
debug_warn( "Inheritance not supported for CJSSharedProperties" );
}
@@ -327,12 +327,12 @@ public:
m_Freshen = Freshen;
m_Intrinsic = true;
}
jsval Get( JSContext* cx, IJSComplex* owner )
jsval Get( JSContext* UNUSED(cx), IJSComplex* owner )
{
if( m_Freshen ) (owner->*m_Freshen)();
return( ToJSVal( *m_Data ) );
}
void ImmediateCopy( IJSComplex* CopyTo, IJSComplex* CopyFrom, IJSComplexProperty* CopyProperty )
void ImmediateCopy( IJSComplex* UNUSED(CopyTo), IJSComplex* UNUSED(CopyFrom), IJSComplexProperty* CopyProperty )
{
*m_Data = *( ( (CJSComplexProperty*)CopyProperty )->m_Data );
}
@@ -399,19 +399,20 @@ public:
if( JSVAL_IS_GCTHING( m_Data ) )
JS_RemoveRoot( g_ScriptingHost.GetContext(), (void*)&m_Data );
}
jsval Get( JSContext* cx, IJSComplex* owner )
jsval Get( JSContext* UNUSED(cx), IJSComplex* UNUSED(owner) )
{
return( m_Data );
}
void Set( JSContext* cx, IJSComplex* owner, jsval Value )
void Set( JSContext* UNUSED(cx), IJSComplex* UNUSED(owner), jsval Value )
{
Uproot();
m_Data = Value;
Root();
}
void ImmediateCopy( IJSComplex* CopyTo, IJSComplex* CopyFrom, IJSComplexProperty* CopyProperty )
void ImmediateCopy( IJSComplex* UNUSED(CopyTo), IJSComplex* UNUSED(CopyFrom),
IJSComplexProperty* UNUSED(CopyProperty) )
{
debug_assert( 0 && "ImmediateCopy called on a CJSValComplexProperty (something's gone wrong with the inheritance on this object)" );
debug_warn("ImmediateCopy called on a CJSValComplexProperty (something's gone wrong with the inheritance on this object)" );
}
};
@@ -433,18 +434,18 @@ public:
// Must at least be able to read
debug_assert( m_Getter );
}
jsval Get( JSContext* cx, IJSComplex* owner )
jsval Get( JSContext* UNUSED(cx), IJSComplex* owner )
{
return( (owner->*m_Getter)() );
}
void Set( JSContext* cx, IJSComplex* owner, jsval Value )
void Set( JSContext* UNUSED(cx), IJSComplex* owner, jsval Value )
{
if( m_Setter )
(owner->*m_Setter)( Value );
}
void ImmediateCopy( IJSComplex* CopyTo, IJSComplex* CopyFrom, IJSComplexProperty* CopyProperty )
void ImmediateCopy( IJSComplex* UNUSED(CopyTo), IJSComplex* UNUSED(CopyFrom), IJSComplexProperty* UNUSED(CopyProperty) )
{
debug_assert( 0 && "ImmediateCopy called on a property wrapping getter/setter functions (something's gone wrong with the inheritance for this object)" );
debug_warn("ImmediateCopy called on a property wrapping getter/setter functions (something's gone wrong with the inheritance for this object)" );
}
};