mirror of https://github.com/PCSX2/pcsx2.git
Not particularly tested, but fix Linux.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1931 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
158b01b58d
commit
3d789c5da3
|
@ -105,10 +105,10 @@ typedef s32 sptr;
|
|||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
// A rough-and-ready cross platform 128-bit datatype, Non-SSE style.
|
||||
//
|
||||
// Note: These structs do not provide any additional constructors because C++ can't allow
|
||||
// the use of dataypes with constructors in unions (and since unions are ont of the primary
|
||||
// uses of these types, that measn we can't have constructors). Embedded functions for
|
||||
// performing explicity conversion from 64 and 32 bit values is provided instead.
|
||||
// Note: These structs don't provide any additional constructors because C++ doesn't allow
|
||||
// the use of datatypes with constructors in unions (and since unions aren't the primary
|
||||
// uses of these types, that means we can't have constructors). Embedded functions for
|
||||
// performing explicit conversion from 64 and 32 bit values are provided instead.
|
||||
//
|
||||
#ifdef __cplusplus
|
||||
struct u128
|
||||
|
@ -167,4 +167,4 @@ typedef union _s128_t
|
|||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -165,7 +165,7 @@ public:
|
|||
|
||||
operator unspecified_bool_type() const
|
||||
{
|
||||
return ( !IsEmpty() ) ? &pxScopedPtr<T>::get : NULL;
|
||||
return ( !IsEmpty() ) ? &ScopedPtr<T>::get : NULL;
|
||||
}
|
||||
|
||||
void reset(T * ptr = &DefaultStaticInst)
|
||||
|
|
Loading…
Reference in New Issue