projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-core.git]
/
dali
/
integration-api
/
lockless-buffer.h
diff --git
a/dali/integration-api/lockless-buffer.h
b/dali/integration-api/lockless-buffer.h
index
5a7cc58
..
8c0530d
100644
(file)
--- a/
dali/integration-api/lockless-buffer.h
+++ b/
dali/integration-api/lockless-buffer.h
@@
-25,8
+25,6
@@
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/common/dali-common.h>
-#include <atomic>
-
namespace Dali
{
namespace Dali
{
@@
-104,7
+102,7
@@
private:
private:
unsigned char* mBuffer[2]; ///< bitmap buffers
private:
unsigned char* mBuffer[2]; ///< bitmap buffers
-
volatile std::__atomic_base<BufferState>
mState; ///< readbuffer number and whether we're currently writing into writebuffer or not
+
BufferState volatile
mState; ///< readbuffer number and whether we're currently writing into writebuffer or not
size_t mSize; ///< size of buffers
};
size_t mSize; ///< size of buffers
};