diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-01-06 13:00:33 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-01-06 13:00:33 +0000 |
| commit | 0c3e5dd1e6efc0c30d679ac2c57ab12f86c6c5af (patch) | |
| tree | 8734c604f70400562d350f154606f6a31cd1f39e | |
| parent | 68dd05da9496df06cf539939583f2444b2ce9292 (diff) | |
| download | gcc-0c3e5dd1e6efc0c30d679ac2c57ab12f86c6c5af.zip gcc-0c3e5dd1e6efc0c30d679ac2c57ab12f86c6c5af.tar.gz gcc-0c3e5dd1e6efc0c30d679ac2c57ab12f86c6c5af.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/std_mutex.h (renamed from libstdc++-v3/include/bits/mutex.h) | 0 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/condition_variable | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/mutex | 2 |
6 files changed, 12 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 362c835..9db050d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index e657420..b0a9373 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -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 \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 077446b..5165154 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -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 \ diff --git a/libstdc++-v3/include/bits/mutex.h b/libstdc++-v3/include/bits/std_mutex.h index 67b7825..67b7825 100644 --- a/libstdc++-v3/include/bits/mutex.h +++ b/libstdc++-v3/include/bits/std_mutex.h diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable index 677b2a8..62a7ee1 100644 --- a/libstdc++-v3/include/std/condition_variable +++ b/libstdc++-v3/include/std/condition_variable @@ -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> diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index 9ac1d27..1f4da57 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -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> |