diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-11-15 05:29:10 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-11-15 05:29:10 +0000 |
| commit | 73ed235fd19c4c19c3b6d56ce6d9631980487b0d (patch) | |
| tree | 65ae6f7d314b3adf857fa5a8754a777e4435197d /Source/Core/VideoCommon | |
| parent | b4ffd640b7a5f66309bcf22e9008e0059f66ca98 (diff) | |
Changed macro for disallowing copy-ctor and =operator into an inheritable class. Removed IrPointer.ini (no longer used)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6421 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/NativeVertexFormat.h | 5 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/VertexLoader.h | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/Src/NativeVertexFormat.h b/Source/Core/VideoCommon/Src/NativeVertexFormat.h index 499a1b451d..bff59b572a 100644 --- a/Source/Core/VideoCommon/Src/NativeVertexFormat.h +++ b/Source/Core/VideoCommon/Src/NativeVertexFormat.h @@ -88,7 +88,7 @@ struct PortableVertexDeclaration // Note that this class can't just invent arbitrary vertex formats out of its input - // all the data loading code must always be made compatible. -class NativeVertexFormat +class NativeVertexFormat : NonCopyable { public: virtual ~NativeVertexFormat() {} @@ -108,9 +108,6 @@ public: protected: // Let subclasses construct. NativeVertexFormat() {} - -private: - DISALLOW_COPY_AND_ASSIGN(NativeVertexFormat); }; #endif // _NATIVEVERTEXFORMAT_H diff --git a/Source/Core/VideoCommon/Src/VertexLoader.h b/Source/Core/VideoCommon/Src/VertexLoader.h index 4ec3c5f64a..98a57cb9ff 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.h +++ b/Source/Core/VideoCommon/Src/VertexLoader.h @@ -76,7 +76,7 @@ private: } }; -class VertexLoader : public Gen::XCodeBlock +class VertexLoader : public Gen::XCodeBlock, NonCopyable { public: VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr); @@ -124,8 +124,6 @@ private: void WriteGetVariable(int bits, Gen::OpArg dest, void *address); void WriteSetVariable(int bits, void *address, Gen::OpArg dest); - - DISALLOW_COPY_AND_ASSIGN(VertexLoader); }; #endif |