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

Quick fix for GCC versions 4.2 and earlier, which lack the __COUNTER__ define. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1722 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-09-01 00:58:39 +00:00
parent fa7eae8edb
commit 0a4b4e31bf
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2/Exceptions.h
View File

@ -37,11 +37,17 @@ private:
const NoncopyableObject& operator=( const NoncopyableObject& ); const NoncopyableObject& operator=( const NoncopyableObject& );
}; };
#ifdef __COUNTER__
// Use this macro/class as a base to seal a class from being derived from.
// This macro works by providing a unique base class with a protected constructor
// for every class that derives from it.
# define Sealed private virtual __BaseSealed<__COUNTER__>
// Base class used to implement type-safe sealed classes. // Base class used to implement type-safe sealed classes.
// This class should never be used directly. Use the Sealed // This class should never be used directly. Use the Sealed
// macro instead, which ensures all sealed classes derive from a unique BaseSealed // macro instead, which ensures all sealed classes derive from a unique BaseSealed
// (preventing them from accidentally cirumventing sealing by inheriting from // (preventing them from accidentally circumventing sealing by inheriting from
// multiple sealed classes. // multiple sealed classes.
template < int T > template < int T >
class __BaseSealed class __BaseSealed
@ -52,10 +58,9 @@ protected:
} }
}; };
// Use this macro/class as a base to seal a class from being derrived from. #else
// This macro works by providing a unique base class with a protected constructor # define Sealed // old versions of GCC 4.2 and earlier >_<
// for every class that derives from it. #endif
#define Sealed private virtual __BaseSealed<__COUNTER__>
namespace Exception namespace Exception
{ {
@ -66,7 +71,7 @@ namespace Exception
class BaseException class BaseException
{ {
protected: protected:
const std::string m_message; // a "detailed" message of what disasterous thing has occured! const std::string m_message; // a "detailed" message of what disastrous thing has occurred!
public: public:
virtual ~BaseException() throw()=0; // the =0; syntax forces this class into "abstract" mode. virtual ~BaseException() throw()=0; // the =0; syntax forces this class into "abstract" mode.