diff options
| author |  bunnei | 2014-09-09 20:50:51 -0400 |
|---|---|---|
| committer | bunnei | 2014-09-09 20:50:51 -0400 |
| commit | 7f201a98217bb31e0f5a36471b173823d9f9747b (patch) | |
| tree | 5c394482907bf801cab150c8a84f03588f0282cf | |
| parent | Merge pull request #95 from lioncash/disassembler (diff) | |
| parent | Common: Remove HAVE_CXX11_SYNTAX define from Common.h (diff) | |
| download | yuzu-7f201a98217bb31e0f5a36471b173823d9f9747b.tar.gz yuzu-7f201a98217bb31e0f5a36471b173823d9f9747b.tar.xz yuzu-7f201a98217bb31e0f5a36471b173823d9f9747b.zip | |
Merge pull request #102 from lioncash/define
Common: Remove HAVE_CXX11_SYNTAX define from Common.h
| -rw-r--r-- | src/common/common.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/common/common.h b/src/common/common.h index cb69eabe4..9f3016d34 100644 --- a/src/common/common.h +++ b/src/common/common.h | |||
| @@ -20,11 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #define STACKALIGN | 21 | #define STACKALIGN |
| 22 | 22 | ||
| 23 | #if __cplusplus >= 201103L || defined(_MSC_VER) || defined(__GXX_EXPERIMENTAL_CXX0X__) | ||
| 24 | #define HAVE_CXX11_SYNTAX 1 | ||
| 25 | #endif | ||
| 26 | |||
| 27 | #if HAVE_CXX11_SYNTAX | ||
| 28 | // An inheritable class to disallow the copy constructor and operator= functions | 23 | // An inheritable class to disallow the copy constructor and operator= functions |
| 29 | class NonCopyable | 24 | class NonCopyable |
| 30 | { | 25 | { |
| @@ -36,7 +31,6 @@ private: | |||
| 36 | NonCopyable(NonCopyable&); | 31 | NonCopyable(NonCopyable&); |
| 37 | NonCopyable& operator=(NonCopyable& other); | 32 | NonCopyable& operator=(NonCopyable& other); |
| 38 | }; | 33 | }; |
| 39 | #endif | ||
| 40 | 34 | ||
| 41 | #include "common/log.h" | 35 | #include "common/log.h" |
| 42 | #include "common/common_types.h" | 36 | #include "common/common_types.h" |