[GTK] Compile everything in C++11 mode

https://bugs.webkit.org/show_bug.cgi?id=116452

Reviewed by Anders Carlsson.

.:

* Source/autotools/SetupCompilerFlags.m4: Use the C++11 standard by default when compiling C++ source code.
Perform some minor cleanup around the comments and the order of specifying additional CXXFLAGS entries.

Source/WebKit2:

* GNUmakefile.am: Remove the -std=c++11 flags from the various CPPFLAGS lists, the mode is now specified
by default for all the C++ source code in SetupCompilerFlags.m4.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 3d9ae04434fb83697369e1301a9f71aa6463825c..4b0de6c3857015a244ef58027cb041f2563a4873 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-05-21  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Compile everything in C++11 mode
+        https://bugs.webkit.org/show_bug.cgi?id=116452
+
+        Reviewed by Anders Carlsson.
+
+        * Source/autotools/SetupCompilerFlags.m4: Use the C++11 standard by default when compiling C++ source code.
+        Perform some minor cleanup around the comments and the order of specifying additional CXXFLAGS entries.
+
 2013-05-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [BlackBerry] Make PagePopup implementation independent from WebCore

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 68a2f8a019793fe2a2651acb03bd79da9a6078a1..d60dfb7f08e3f33f1c65f5e9e215e34662c4b4e5 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2013-05-21  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Compile everything in C++11 mode
+        https://bugs.webkit.org/show_bug.cgi?id=116452
+
+        Reviewed by Anders Carlsson.
+
+        * GNUmakefile.am: Remove the -std=c++11 flags from the various CPPFLAGS lists, the mode is now specified
+        by default for all the C++ source code in SetupCompilerFlags.m4.
+
 2013-05-21  Jessie Berlin  <jberlin@apple.com>
 
         Expose a way to know when forms are added to a page or when form controls are added to a form

diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
index 70add89b083ae903bb11d5ef80142a15a2ef4059..39d0720e58d51ffd7fc776a9192c05cebc5f7e44 100644 (file)
--- a/Source/WebKit2/GNUmakefile.am
+++ b/Source/WebKit2/GNUmakefile.am
@@ -35,7 +35,6 @@ libWebKit2Platform_la_CPPFLAGS = \
        -DBUILDING_WEBKIT \
        $(global_cppflags) \
        -fno-strict-aliasing \
-       -std=c++11 \
        -I$(srcdir)/Source \
        -I$(srcdir)/Source/WTF \
        -I$(srcdir)/Source/WebKit2/Platform \
@@ -69,7 +68,6 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOU
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
        -fno-strict-aliasing \
        -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-       -std=c++11 \
        $(global_cppflags) \
        -include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
        -I$(srcdir)/Source/WebKit/gtk \
@@ -441,7 +439,6 @@ Programs_WebKitWebProcess_CPPFLAGS = \
        -I$(top_builddir)/DerivedSources/WebKit2 \
        -I$(top_builddir)/DerivedSources/WebKit2/include \
        -I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
-       -std=c++11 \
        $(global_cppflags) \
        $(javascriptcore_cppflags)
 
@@ -552,7 +549,6 @@ libwebkit2gtkinjectedbundle_la_CPPFLAGS = \
        -I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/c \
        -I$(top_builddir)/DerivedSources/InjectedBundle \
        -I$(top_builddir)/DerivedSources/WebKit2/include \
-       -std=c++11 \
        $(global_cppflags) \
        $(javascriptcore_cppflags) \
        $(GLIB_CFLAGS)
@@ -616,7 +612,6 @@ Programs_WebKitPluginProcess_CPPFLAGS = \
        -DGTK_API_VERSION_2=1 \
        -DENABLE_PLUGIN_PROCESS=1 \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
-       -std=c++11 \
        $(global_cppflags) \
        $(platform_cppflags) \
        $(platformgtk_cppflags) \

diff --git a/Source/autotools/SetupCompilerFlags.m4 b/Source/autotools/SetupCompilerFlags.m4
index ff0b07bbb2a19316017b9c378a532b2835e135d2..bfc0ced2241b7d3a8e5e1856fa82591f2b5718f2 100644 (file)
--- a/Source/autotools/SetupCompilerFlags.m4
+++ b/Source/autotools/SetupCompilerFlags.m4
@@ -1,16 +1,18 @@
 # Use C99 as the language standard for C code.
 CFLAGS="$CFLAGS -std=c99"
-# Do not warn about C++11 incompatibilities.
-CXXFLAGS="$CXXFLAGS -Wno-c++11-compat"
+# Use the C++11 standard. Do not warn about C++11 incompatibilities.
+CXXFLAGS="$CXXFLAGS -std=c++11 -Wno-c++11-compat"
 
-# Clang requires suppression of unused arguments warning.
+# Clang requires suppression of unused arguments warnings.
 if test "$CC" = "clang"; then
     CFLAGS="$CFLAGS -Qunused-arguments"
 fi
-# -Wno-c++11-extensions, currently only usable with Clang, suppresses warnings of C++11 extensions in use.
+
 # libstdc++ is at the moment the only option as the C++ standard library when compiling with Clang.
+# -Wno-c++11-extensions, currently only usable with Clang, suppresses warnings of C++11 extensions in use.
+# Suppress unused arguments warnings for C++ files as well.
 if test "$CXX" = "clang++"; then
-    CXXFLAGS="$CXXFLAGS -Wno-c++11-extensions -stdlib=libstdc++ -Qunused-arguments"
+    CXXFLAGS="$CXXFLAGS -stdlib=libstdc++ -Wno-c++11-extensions -Qunused-arguments"
 fi
 
 if test "$host_cpu" = "sh4"; then