ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
arcum42 2009-09-29 22:05:21 +00:00
parent 158b01b58d
commit 3d789c5da3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/include/Pcsx2Types.h
View File

@ -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

2
common/include/Utilities/ScopedPtr.h
View File

@ -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)