diff options
| author | bunnei <bunneidev@gmail.com> | 2014-09-04 20:36:21 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-09-04 20:36:21 -0400 |
| commit | 5d95d038a0e5d203a568223da12b57c30d048a8c (patch) | |
| tree | 7aaaa7f594244f81c2fc813d40e099a5bbc1a9e8 /src/common/atomic.h | |
| parent | fda291816b4b86ace15a210d66143a2dadc769e0 (diff) | |
| parent | 4795a64fc8ff59fced28735e627deb7c3b4575ed (diff) | |
Merge pull request #88 from archshift/remove-atomic
Removed common/atomic, instead using std::atomic
Diffstat (limited to 'src/common/atomic.h')
| -rw-r--r-- | src/common/atomic.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/common/atomic.h b/src/common/atomic.h deleted file mode 100644 index 941f5ad5ea..0000000000 --- a/src/common/atomic.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -#ifdef _WIN32 - -#include "common/atomic_win32.h" - -#else - -// GCC-compatible compiler assumed! -#include "common/atomic_gcc.h" - -#endif |