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

linux compile fix (explicit instantiation must be at namespace scope), adjust end pointer to match 8 bytes removed in workaround

Browse Source 
This was SVN commit r9153.
This commit is contained in:
janwas 2011-04-03 19:29:16 +00:00
parent 9e1850bbe5
commit 231387d2da
1 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/lib/sysdep/smbios.cpp
View File

@ -24,7 +24,7 @@
#include "smbios.h"
#include "lib/bits.h"
#include "lib/byte_order.h"
#include "lib/byte_order.h" // FOURCC_BE
#include "lib/module_init.h"
#if OS_WIN
@ -71,6 +71,8 @@ static LibError GetTable(wfirmware::Table& table)
#endif // OS_WIN
//-----------------------------------------------------------------------------
// pointers to the strings (if any) at the end of an SMBIOS structure
typedef std::vector<const char*> Strings;
@ -149,9 +151,18 @@ public:
}
}
template<>
void operator()<const char*>(size_t flags, const char*& t, const char* UNUSED(name), const char* UNUSED(units))
{
private:
const u8* data;
const u8* end;
const Strings& strings;
};
// C++03 14.7.3(2): "An explicit specialization shall be declared [..] in the
// namespace of which the enclosing class [..] is a member.
template<>
void FieldInitializer::operator()<const char*>(size_t flags, const char*& t, const char* UNUSED(name), const char* UNUSED(units))
{
u8 number;
operator()(flags, number, 0, 0);
if(number == 0)
@ -177,13 +188,7 @@ public:
strcpy(stringStoragePos, strings[number-1]);
t = stringStoragePos;
stringStoragePos += strlen(t)+1;
}
private:
const u8* data;
const u8* end;
const Strings& strings;
};
}
//-----------------------------------------------------------------------------
@ -294,7 +299,8 @@ static LibError InitStructures()
// workaround for stupid AMIBIOS that repeats the first 8 bytes
if(memcmp(&table[0], &table[8], 8) == 0)
{
memmove(&table[8], &table[16], 8);
memmove(&table[8], &table[16], table.size()-8);
table.resize(table.size()-8);
table[1] += 8; // the first length field is 8 bytes short, too
}