piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changed macro for disallowing copy-ctor and =operator into an inheritable class. Removed IrPointer.ini (no longer used)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6421 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-11-15 05:29:10 +00:00
parent b4ffd640b7
commit 73ed235fd1
10 changed files with 17 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Common/Src/Common.h
View File

@ -38,11 +38,15 @@ extern const char *netplay_dolphin_ver;
#define STACKALIGN
// A macro to disallow the copy constructor and operator= functions
// This should be used in the private: declarations for a class
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \
void operator=(const TypeName&)
// An inheritable class to disallow the copy constructor and operator= functions
class NonCopyable
{
protected:
NonCopyable() {}
private:
NonCopyable(const NonCopyable&);
void operator=(const NonCopyable&);
};
#include "Log.h"
#include "CommonTypes.h"

3
Source/Core/Common/Src/LogManager.h
View File

@ -106,7 +106,7 @@ namespace Common {
class CriticalSection;
}
class LogManager
class LogManager : NonCopyable
{
private:
LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS];
@ -117,7 +117,6 @@ private:
LogManager();
~LogManager();
DISALLOW_COPY_AND_ASSIGN(LogManager);
public:
static u32 GetMaxLevel() { return MAX_LOGLEVEL; }