diff mbox

Fix warning during libstdc++ build

Message ID 20150128150234.GG3360@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely Jan. 28, 2015, 3:02 p.m. UTC 
On 07/01/15 22:49 +0000, Jonathan Wakely wrote:
>This fixes a -Wc++14-compat warning in the new libsupc++/del_ops.cc
>file that defines the C++14 sized deallocation function.
>
>Tested x86_64-linux, committed to trunk.
>

And another instance of the same warning.

Tested x86_64-linux, committed to trunk.
diff mbox

Patch

commit 3618d497ea61020de59464500c5cf38a52bc690a
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Jan 28 09:52:53 2015 +0000

    	PR libstdc++/64828
    	* libsupc++/Makefile.am: Compile del_opvs.cc as C++14.
    	* libsupc++/Makefile.in: Regenerate.
    	* src/c++11/Makefile.in: Regenerate.

diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index aace1a6..b87ffbf 100644
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -182,6 +182,10 @@  del_ops.lo: del_ops.cc
 	$(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
 del_ops.o: del_ops.cc
 	$(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
+del_opvs.lo: del_opvs.cc
+	$(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
+del_opvs.o: del_opvs.cc
+	$(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually
diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 50fee54..0ab0417 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -875,6 +875,10 @@  del_ops.lo: del_ops.cc
 	$(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
 del_ops.o: del_ops.cc
 	$(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
+del_opvs.lo: del_opvs.cc
+	$(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
+del_opvs.o: del_opvs.cc
+	$(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
 
 install-stdHEADERS: $(std_HEADERS)
 	@$(NORMAL_INSTALL)
diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in
index 70d5bd7..12b6346 100644
--- a/libstdc++-v3/src/c++11/Makefile.in
+++ b/libstdc++-v3/src/c++11/Makefile.in
@@ -74,10 +74,10 @@  libc__11convenience_la_LIBADD =
 am__objects_2 = ctype_configure_char.lo ctype_members.lo
 am__objects_3 = chrono.lo codecvt.lo condition_variable.lo \
 	cow-stdexcept.lo ctype.lo debug.lo functexcept.lo \
-	functional.lo futex.lo future.lo hash_c++0x.lo hashtable_c++0x.lo \
-	ios.lo limits.lo mutex.lo placeholders.lo random.lo regex.lo \
-	shared_ptr.lo snprintf_lite.lo system_error.lo thread.lo \
-	$(am__objects_1) $(am__objects_2)
+	functional.lo futex.lo future.lo hash_c++0x.lo \
+	hashtable_c++0x.lo ios.lo limits.lo mutex.lo placeholders.lo \
+	random.lo regex.lo shared_ptr.lo snprintf_lite.lo \
+	system_error.lo thread.lo $(am__objects_1) $(am__objects_2)
 @ENABLE_DUAL_ABI_TRUE@am__objects_4 = cow-fstream-inst.lo \
 @ENABLE_DUAL_ABI_TRUE@	cow-sstream-inst.lo cow-string-inst.lo \
 @ENABLE_DUAL_ABI_TRUE@	cow-wstring-inst.lo cxx11-locale-inst.lo \