hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
hyung-hwan 2008-03-13 23:45:36 +00:00
parent 9121b6cbad
commit 32823b0cca
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ase/awk/Awk.cpp
View File

@ -1,5 +1,5 @@
/* /*
* $Id: Awk.cpp 123 2008-03-12 12:06:22Z baconevi $ * $Id: Awk.cpp 129 2008-03-13 05:45:36Z baconevi $
* *
* {License} * {License}
*/ */
@ -230,11 +230,7 @@ void Awk::Argument::clear ()
this->inum = 0; this->inum = 0;
} }
#if defined(__SPU__)
void* Awk::Argument::operator new (std::size_t n, awk_t* awk) throw ()
#else
void* Awk::Argument::operator new (size_t n, awk_t* awk) throw () void* Awk::Argument::operator new (size_t n, awk_t* awk) throw ()
#endif
{ {
void* ptr = ase_awk_malloc (awk, ASE_SIZEOF(awk) + n); void* ptr = ase_awk_malloc (awk, ASE_SIZEOF(awk) + n);
if (ptr == ASE_NULL) return ASE_NULL; if (ptr == ASE_NULL) return ASE_NULL;
@ -243,11 +239,7 @@ void* Awk::Argument::operator new (size_t n, awk_t* awk) throw ()
return (char*)ptr+ASE_SIZEOF(awk); return (char*)ptr+ASE_SIZEOF(awk);
} }
#if defined(__SPU__)
void* Awk::Argument::operator new[] (std::size_t n, awk_t* awk) throw ()
#else
void* Awk::Argument::operator new[] (size_t n, awk_t* awk) throw () void* Awk::Argument::operator new[] (size_t n, awk_t* awk) throw ()
#endif
{ {
void* ptr = ase_awk_malloc (awk, ASE_SIZEOF(awk) + n); void* ptr = ase_awk_malloc (awk, ASE_SIZEOF(awk) + n);
if (ptr == ASE_NULL) return ASE_NULL; if (ptr == ASE_NULL) return ASE_NULL;

11
ase/awk/Awk.hpp
View File

@ -1,5 +1,5 @@
/* /*
* $Id: Awk.hpp 123 2008-03-12 12:06:22Z baconevi $ * $Id: Awk.hpp 129 2008-03-13 05:45:36Z baconevi $
* *
* {License} * {License}
*/ */
@ -11,10 +11,6 @@
#include <ase/cmn/map.h> #include <ase/cmn/map.h>
#include <stdarg.h> #include <stdarg.h>
#if defined(__SPU__)
#include <new>
#endif
///////////////////////////////// /////////////////////////////////
ASE_BEGIN_NAMESPACE(ASE) ASE_BEGIN_NAMESPACE(ASE)
///////////////////////////////// /////////////////////////////////
@ -311,13 +307,8 @@ public:
public: public:
// initialization // initialization
#if defined(__SPU__)
void* operator new (std::size_t n, awk_t* awk) throw ();
void* operator new[] (std::size_t n, awk_t* awk) throw ();
#else
void* operator new (size_t n, awk_t* awk) throw (); void* operator new (size_t n, awk_t* awk) throw ();
void* operator new[] (size_t n, awk_t* awk) throw (); void* operator new[] (size_t n, awk_t* awk) throw ();
#endif
#if !defined(__BORLANDC__) #if !defined(__BORLANDC__)
// deletion when initialization fails // deletion when initialization fails

7
ase/cmn/types.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: types.h 119 2008-03-07 03:04:51Z baconevi $ * $Id: types.h 129 2008-03-13 05:45:36Z baconevi $
* *
* {License} * {License}
*/ */
@ -35,7 +35,10 @@ typedef int ase_tri_t;
#define ase_dead -1 #define ase_dead -1
/* integer that can hold a pointer */ /* integer that can hold a pointer */
#if ASE_SIZEOF_VOID_P == ASE_SIZEOF_INT #if defined(__SPU__) && (ASE_SIZEOF_VOID_P == ASE_SIZEOF_LONG)
typedef long ase_int_t;
typedef unsigned long ase_uint_t;
#elif ASE_SIZEOF_VOID_P == ASE_SIZEOF_INT
typedef int ase_int_t; typedef int ase_int_t;
typedef unsigned int ase_uint_t; typedef unsigned int ase_uint_t;
#elif ASE_SIZEOF_VOID_P == ASE_SIZEOF_LONG #elif ASE_SIZEOF_VOID_P == ASE_SIZEOF_LONG