Decouple <cstddef>
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
|
||||
#include "test_misc.h"
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
@@ -255,8 +256,8 @@ const int TestDataSize = 2;
|
||||
|
||||
/* Find "haystack" in "needle". Start looking at "expect" and move outward; find
|
||||
* the closest. */
|
||||
void *xmemsearch( const float *haystack, size_t iHaystackSamples,
|
||||
const int16_t *needle, size_t iNeedleSamples,
|
||||
void *xmemsearch( const float *haystack, std::size_t iHaystackSamples,
|
||||
const int16_t *needle, std::size_t iNeedleSamples,
|
||||
int expect )
|
||||
{
|
||||
if( !iNeedleSamples )
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "RageUtil_FileDB.h"
|
||||
#include "test_misc.h"
|
||||
|
||||
#include <cstddef>
|
||||
#include <errno.h>
|
||||
|
||||
static RString g_TestFile;
|
||||
@@ -57,7 +58,7 @@ protected:
|
||||
f.hash = GetHashForString( g_TestFile );
|
||||
fs.files.insert(f);
|
||||
}
|
||||
|
||||
|
||||
RString root;
|
||||
|
||||
public:
|
||||
@@ -75,8 +76,8 @@ class RageFileObjTest: public RageFileObj
|
||||
public:
|
||||
RageFileObjTest( const RString &path );
|
||||
RageFileObjTest( const RageFileObjTest &cpy );
|
||||
int ReadInternal(void *buffer, size_t bytes);
|
||||
int WriteInternal(const void *buffer, size_t bytes);
|
||||
int ReadInternal(void *buffer, std::size_t bytes);
|
||||
int WriteInternal(const void *buffer, std::size_t bytes);
|
||||
int Flush();
|
||||
void Rewind() { pos = 0; }
|
||||
int Seek( int offset )
|
||||
@@ -132,7 +133,7 @@ RageFileObjTest::RageFileObjTest( const RString &path_ )
|
||||
pos = 0;
|
||||
}
|
||||
|
||||
int RageFileObjTest::ReadInternal( void *buf, size_t bytes )
|
||||
int RageFileObjTest::ReadInternal( void *buf, std::size_t bytes )
|
||||
{
|
||||
bytes = std::min( bytes, g_TestFile.size()-pos );
|
||||
|
||||
@@ -144,7 +145,7 @@ int RageFileObjTest::ReadInternal( void *buf, size_t bytes )
|
||||
g_BytesUntilError = -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
g_BytesUntilError -= std::min( g_BytesUntilError, (int) bytes );
|
||||
}
|
||||
|
||||
@@ -153,7 +154,7 @@ int RageFileObjTest::ReadInternal( void *buf, size_t bytes )
|
||||
return bytes;
|
||||
}
|
||||
|
||||
int RageFileObjTest::WriteInternal( const void *buf, size_t bytes )
|
||||
int RageFileObjTest::WriteInternal( const void *buf, std::size_t bytes )
|
||||
{
|
||||
if( g_BytesUntilError != -1 )
|
||||
{
|
||||
@@ -240,7 +241,7 @@ void SanityCheck()
|
||||
if( test.GetError() != "Fake error" )
|
||||
Fail( "Sanity check 2 GetError(): expected \"Fake error\", got \"%s\"", test.GetError().c_str() );
|
||||
} while(false);
|
||||
|
||||
|
||||
/* Write error sanity check. */
|
||||
do {
|
||||
g_TestFilename = "file";
|
||||
@@ -273,7 +274,7 @@ void IniTest()
|
||||
g_TestFile =
|
||||
"[test]\n"
|
||||
"abc=def";
|
||||
|
||||
|
||||
g_BytesUntilError = -1;
|
||||
|
||||
IniFile test;
|
||||
@@ -292,7 +293,7 @@ void IniTest()
|
||||
g_TestFile =
|
||||
"[test]\n"
|
||||
"abc=def";
|
||||
|
||||
|
||||
g_BytesUntilError = 5;
|
||||
|
||||
IniFile test;
|
||||
@@ -325,7 +326,7 @@ void MsdTest()
|
||||
/* Read check. */
|
||||
do {
|
||||
g_TestFile = "#FOO;";
|
||||
|
||||
|
||||
g_BytesUntilError = -1;
|
||||
|
||||
MsdFile test;
|
||||
|
||||
+21
-20
@@ -3,6 +3,7 @@
|
||||
#include <cstdlib>
|
||||
#include <cassert>
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <algorithm>
|
||||
#include <archutils/Darwin/VectorHelper.h>
|
||||
|
||||
@@ -28,7 +29,7 @@ static void *pStupid;
|
||||
#endif
|
||||
|
||||
// The reference values.
|
||||
static void ScalarWrite( float *pDestBuf, const float *pSrcBuf, size_t iSize )
|
||||
static void ScalarWrite( float *pDestBuf, const float *pSrcBuf, std::size_t iSize )
|
||||
{
|
||||
for( unsigned iPos = 0; iPos < iSize; ++iPos )
|
||||
pDestBuf[iPos] += pSrcBuf[iPos];
|
||||
@@ -49,7 +50,7 @@ static void RandBuffer( float *pBuffer, unsigned iSize )
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static void Diagnostic( const T *pDestBuf, const T *pRefBuf, size_t size )
|
||||
static void Diagnostic( const T *pDestBuf, const T *pRefBuf, std::size_t size )
|
||||
{
|
||||
const int num = 10;
|
||||
for( int i = 0; i < num; ++i )
|
||||
@@ -58,16 +59,16 @@ static void Diagnostic( const T *pDestBuf, const T *pRefBuf, size_t size )
|
||||
for( int i = 0; i < num; ++i )
|
||||
fprintf( stderr, "%0*x ", sizeof(T)*2, pRefBuf[i] );
|
||||
puts( "" );
|
||||
for( size_t i = size - num; i < size; ++i )
|
||||
for( std::size_t i = size - num; i < size; ++i )
|
||||
fprintf( stderr, "%0*x ", sizeof(T)*2, pDestBuf[i] );
|
||||
puts( "" );
|
||||
for( size_t i = size - num; i < size; ++i )
|
||||
for( std::size_t i = size - num; i < size; ++i )
|
||||
fprintf( stderr, "%0*x ", sizeof(T)*2, pRefBuf[i] );
|
||||
puts( "" );
|
||||
}
|
||||
|
||||
template<>
|
||||
static void Diagnostic<float>( const float *pDestBuf, const float *pRefBuf, size_t size )
|
||||
static void Diagnostic<float>( const float *pDestBuf, const float *pRefBuf, std::size_t size )
|
||||
|
||||
{
|
||||
const int num = 10;
|
||||
@@ -77,15 +78,15 @@ static void Diagnostic<float>( const float *pDestBuf, const float *pRefBuf, size
|
||||
for( int i = 0; i < num; ++i )
|
||||
fprintf( stderr, "%f ", pRefBuf[i] );
|
||||
puts( "" );
|
||||
for( size_t i = size - num; i < size; ++i )
|
||||
for( std::size_t i = size - num; i < size; ++i )
|
||||
fprintf( stderr, "%f ", pDestBuf[i] );
|
||||
puts( "" );
|
||||
for( size_t i = size - num; i < size; ++i )
|
||||
for( std::size_t i = size - num; i < size; ++i )
|
||||
fprintf( stderr, "%f ", pRefBuf[i] );
|
||||
puts( "" );
|
||||
}
|
||||
|
||||
static bool TestWrite( float *pSrcBuf, float *pDestBuf, float *pRefBuf, size_t iSize )
|
||||
static bool TestWrite( float *pSrcBuf, float *pDestBuf, float *pRefBuf, std::size_t iSize )
|
||||
{
|
||||
RandBuffer( pSrcBuf, iSize );
|
||||
memset( pDestBuf, 0, iSize * 4 );
|
||||
@@ -97,12 +98,12 @@ static bool TestWrite( float *pSrcBuf, float *pDestBuf, float *pRefBuf, size_t i
|
||||
|
||||
static bool CheckAlignedWrite()
|
||||
{
|
||||
const size_t size = 1024;
|
||||
const std::size_t size = 1024;
|
||||
float *pSrcBuf = NEW( float, size );
|
||||
float *pDestBuf = NEW( float, size );
|
||||
float *pRefBuf = NEW( float, size );
|
||||
bool ret = true;
|
||||
size_t s;
|
||||
std::size_t s;
|
||||
|
||||
// Test unaligned ends
|
||||
for( int i = 0; i < 16 && ret; ++i )
|
||||
@@ -120,7 +121,7 @@ static bool CheckAlignedWrite()
|
||||
|
||||
static bool CheckMisalignedSrcWrite()
|
||||
{
|
||||
const size_t size = 1024;
|
||||
const std::size_t size = 1024;
|
||||
float *pSrcBuf = NEW( float, size );
|
||||
float *pDestBuf = NEW( float, size );
|
||||
float *pRefBuf = NEW( float, size );
|
||||
@@ -128,7 +129,7 @@ static bool CheckMisalignedSrcWrite()
|
||||
|
||||
for( int j = 0; j < 8 && ret; ++j )
|
||||
{
|
||||
size_t s;
|
||||
std::size_t s;
|
||||
for( int i = 0; i < 8 && ret; ++i )
|
||||
{
|
||||
s = size - i - j; // Source buffer is shrinking.
|
||||
@@ -145,7 +146,7 @@ static bool CheckMisalignedSrcWrite()
|
||||
|
||||
static bool CheckMisalignedDestWrite()
|
||||
{
|
||||
const size_t size = 1024;
|
||||
const std::size_t size = 1024;
|
||||
float *pSrcBuf = NEW( float, size );
|
||||
float *pDestBuf = NEW( float, size );
|
||||
float *pRefBuf = NEW( float, size );
|
||||
@@ -153,7 +154,7 @@ static bool CheckMisalignedDestWrite()
|
||||
|
||||
for( int j = 0; j < 4 && ret; ++j )
|
||||
{
|
||||
size_t s;
|
||||
std::size_t s;
|
||||
for( int i = 0; i < 8 && ret; ++i )
|
||||
{
|
||||
s = size - i - j; // Dest buffer is shrinking.
|
||||
@@ -170,12 +171,12 @@ static bool CheckMisalignedDestWrite()
|
||||
|
||||
static bool CheckMisalignedBothWrite()
|
||||
{
|
||||
const size_t size = 1024;
|
||||
const std::size_t size = 1024;
|
||||
float *pSrcBuf = NEW( float, size );
|
||||
float *pDestBuf = NEW( float, size );
|
||||
float *pRefBuf = NEW( float, size );
|
||||
bool ret = true;
|
||||
size_t s;
|
||||
std::size_t s;
|
||||
|
||||
for( int j = 0; j < 4 && ret; ++j )
|
||||
{
|
||||
@@ -196,12 +197,12 @@ static bool CheckMisalignedBothWrite()
|
||||
return ret;
|
||||
}
|
||||
|
||||
static bool cmp( const int16_t *p1, const int16_t *p2, size_t size )
|
||||
static bool cmp( const int16_t *p1, const int16_t *p2, std::size_t size )
|
||||
{
|
||||
return !memcmp( p1, p2, size * 2 );
|
||||
}
|
||||
|
||||
static bool cmp( const float *p1, const float *p2, size_t size )
|
||||
static bool cmp( const float *p1, const float *p2, std::size_t size )
|
||||
{
|
||||
const float epsilon = 0.000001;
|
||||
++size;
|
||||
@@ -214,7 +215,7 @@ static bool cmp( const float *p1, const float *p2, size_t size )
|
||||
template<typename T>
|
||||
static bool CheckAlignedRead()
|
||||
{
|
||||
const size_t size = 1024;
|
||||
const std::size_t size = 1024;
|
||||
int32_t *pSrcBuf = NEW( int32_t, size );
|
||||
T *pDestBuf = NEW( T, size );
|
||||
T *pRefBuf = NEW( T, size );
|
||||
@@ -243,7 +244,7 @@ static bool CheckAlignedRead()
|
||||
template<typename T>
|
||||
static bool CheckMisalignedRead()
|
||||
{
|
||||
const size_t size = 1024;
|
||||
const std::size_t size = 1024;
|
||||
int32_t *pSrcBuf = NEW( int32_t, size );
|
||||
T *pDestBuf = NEW( T, size );
|
||||
T *pRefBuf = NEW( T, size );
|
||||
|
||||
Reference in New Issue
Block a user