generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp

Browse Source 
Change-Id: Ia41583773abbbe1f52d72d1e7f4b925e621d28ff
This commit is contained in:
Andreas Gampe
2014-09-02 22:02:48 -07:00
parent 69fde6b4a7 2b10e2f122
commit c16f0486fc
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libc/include/stdatomic.h
View File

@@ -58,7 +58,6 @@
/* included. The definitions in <atomic> themselves see */ /* included. The definitions in <atomic> themselves see */
/* the old definition, as they should. */ /* the old definition, as they should. */
/* Client code sees the following definition. */ /* Client code sees the following definition. */
#define _Atomic(t) std::atomic<t> #define _Atomic(t) std::atomic<t>
using std::atomic_is_lock_free; using std::atomic_is_lock_free;