Rename bits/mutex.h to avoid clashing with glibc
* include/Makefile.am: Adjust. * include/Makefile.in: Regenerate. * include/bits/mutex.h: Rename to bits/std_mutex.h. * include/std/condition_variable: Adjust include. * include/std/mutex: Likewise. From-SVN: r232101
This commit is contained in:
parent
68dd05da94
commit
0c3e5dd1e6
6 changed files with 12 additions and 4 deletions
|
@ -1,3 +1,11 @@
|
|||
2016-01-06 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
* include/Makefile.am: Adjust.
|
||||
* include/Makefile.in: Regenerate.
|
||||
* include/bits/mutex.h: Rename to bits/std_mutex.h.
|
||||
* include/std/condition_variable: Adjust include.
|
||||
* include/std/mutex: Likewise.
|
||||
|
||||
2016-01-04 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
Update copyright years.
|
||||
|
|
|
@ -122,7 +122,7 @@ bits_headers = \
|
|||
${bits_srcdir}/mask_array.h \
|
||||
${bits_srcdir}/memoryfwd.h \
|
||||
${bits_srcdir}/move.h \
|
||||
${bits_srcdir}/mutex.h \
|
||||
${bits_srcdir}/std_mutex.h \
|
||||
${bits_srcdir}/ostream.tcc \
|
||||
${bits_srcdir}/ostream_insert.h \
|
||||
${bits_srcdir}/parse_numbers.h \
|
||||
|
|
|
@ -412,7 +412,7 @@ bits_headers = \
|
|||
${bits_srcdir}/mask_array.h \
|
||||
${bits_srcdir}/memoryfwd.h \
|
||||
${bits_srcdir}/move.h \
|
||||
${bits_srcdir}/mutex.h \
|
||||
${bits_srcdir}/std_mutex.h \
|
||||
${bits_srcdir}/ostream.tcc \
|
||||
${bits_srcdir}/ostream_insert.h \
|
||||
${bits_srcdir}/parse_numbers.h \
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#else
|
||||
|
||||
#include <chrono>
|
||||
#include <bits/mutex.h>
|
||||
#include <bits/std_mutex.h>
|
||||
#include <ext/concurrence.h>
|
||||
#include <bits/alloc_traits.h>
|
||||
#include <bits/allocator.h>
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include <type_traits>
|
||||
#include <functional>
|
||||
#include <system_error>
|
||||
#include <bits/mutex.h>
|
||||
#include <bits/std_mutex.h>
|
||||
#if ! _GTHREAD_USE_MUTEX_TIMEDLOCK
|
||||
# include <condition_variable>
|
||||
# include <thread>
|
||||
|
|
Loading…
Add table
Reference in a new issue