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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 362c835899fda7c6f88559de6a9a505b3a986532..9db050da57346e5e8ba35f32c32500b5f907992d 100644 (file)
--- 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 e6574208c8bd23d631840e8304183714d43c4d5d..b0a9373bbcd299268c4a31d22f11fedea2f1abb5 100644 (file)
--- 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 077446b49b86aeb05767cf37dc39bad1ae57a0d4..5165154cbc846efba12cf50760d17cb8ea4d55a3 100644 (file)
--- 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
similarity index 100%
rename from libstdc++-v3/include/bits/mutex.h
rename to libstdc++-v3/include/bits/std_mutex.h

diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable
index 677b2a8fda1a1623ed18045195758d8bb2e6f949..62a7ee1451969a3e639a1e334f83ec44d73c9ad0 100644 (file)
--- 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 9ac1d2726debed3843be23b912f6b07d535487bb..1f4da574513188385177d8b2e51ed316115155c9 100644 (file)
--- 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>