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

OS X build/warning/test fixes

Browse Source 
This was SVN commit r7512.
This commit is contained in:
Ykkrosh 2010-05-07 20:55:23 +00:00
parent c611bf6613
commit 4981af4a57
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/lib/res/sound/snd_mgr.cpp
View File

@ -554,8 +554,8 @@ static void al_src_init()
*/
static void al_src_shutdown()
{
debug_assert(std::count(al_srcs_free, al_srcs_free+al_src_allocated, 0) == 0);
debug_assert(std::count(al_srcs_used, al_srcs_used+al_src_allocated, 0) == (ptrdiff_t)al_src_allocated);
debug_assert(std::count(al_srcs_free, al_srcs_free+al_src_allocated, (uintptr_t)0) == 0);
debug_assert(std::count(al_srcs_used, al_srcs_used+al_src_allocated, (uintptr_t)0) == (ptrdiff_t)al_src_allocated);
AL_CHECK;

2
source/lib/sysdep/stl.h
View File

@ -148,7 +148,7 @@ template<> struct hash<const void*>
{
union {
const void* ptr;
u8 bytes[sizeof(void*)];
unsigned char bytes[sizeof(void*)];
} val;
size_t h = 5381;

2
source/maths/tests/test_Matrix3d.h
View File

@ -44,7 +44,7 @@ public:
for (int y = 0; y < 4; ++y)
{
const float expected = (x==y)? 1.0f : 0.0f;
TS_ASSERT_DELTA(m(x,y), expected, 0.0001f);
TS_ASSERT_DELTA(m(x,y), expected, 0.0002f);
}
}
}

5
source/ps/XML/tests/test_XeroXMB.h
View File

@ -44,6 +44,11 @@ private:
return xmb;
}
void tearDown()
{
m_Buffer.reset();
}
public:
void test_basic()
{

2
source/simulation/EntityStateProcessing.cpp
View File

@ -510,7 +510,7 @@ bool CEntity::ProcessContactActionNoPathing( CEntityOrder* current, int timestep
if( ( m_fsm_cyclepos <= action->m_Speed ) && ( nextpos > action->m_Speed ) )
{
const size_t soundGroupIndex = m_base->m_SoundGroupTable[animation];
// const size_t soundGroupIndex = m_base->m_SoundGroupTable[animation];
// g_soundGroupMgr->PlayNext(soundGroupIndex, m_position);
if(!DispatchEvent( &contactEvent ))