Title: [150445] trunk
Revision
150445
Author
[email protected]
Date
2013-05-21 09:05:31 -0700 (Tue, 21 May 2013)

Log Message

[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.

Modified Paths

Diff

Modified: trunk/ChangeLog (150444 => 150445)


--- trunk/ChangeLog	2013-05-21 16:03:07 UTC (rev 150444)
+++ trunk/ChangeLog	2013-05-21 16:05:31 UTC (rev 150445)
@@ -1,3 +1,13 @@
+2013-05-21  Zan Dobersek  <[email protected]>
+
+        [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  <[email protected]>
 
         [BlackBerry] Make PagePopup implementation independent from WebCore

Modified: trunk/Source/WebKit2/ChangeLog (150444 => 150445)


--- trunk/Source/WebKit2/ChangeLog	2013-05-21 16:03:07 UTC (rev 150444)
+++ trunk/Source/WebKit2/ChangeLog	2013-05-21 16:05:31 UTC (rev 150445)
@@ -1,3 +1,13 @@
+2013-05-21  Zan Dobersek  <[email protected]>
+
+        [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  <[email protected]>
 
         Expose a way to know when forms are added to a page or when form controls are added to a form

Modified: trunk/Source/WebKit2/GNUmakefile.am (150444 => 150445)


--- trunk/Source/WebKit2/GNUmakefile.am	2013-05-21 16:03:07 UTC (rev 150444)
+++ trunk/Source/WebKit2/GNUmakefile.am	2013-05-21 16:05:31 UTC (rev 150445)
@@ -35,7 +35,6 @@
 	-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_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 @@
 	-I$(top_builddir)/DerivedSources/WebKit2 \
 	-I$(top_builddir)/DerivedSources/WebKit2/include \
 	-I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
-	-std=c++11 \
 	$(global_cppflags) \
 	$(_javascript_core_cppflags)
 
@@ -552,7 +549,6 @@
 	-I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/c \
 	-I$(top_builddir)/DerivedSources/InjectedBundle \
 	-I$(top_builddir)/DerivedSources/WebKit2/include \
-	-std=c++11 \
 	$(global_cppflags) \
 	$(_javascript_core_cppflags) \
 	$(GLIB_CFLAGS)
@@ -616,7 +612,6 @@
 	-DGTK_API_VERSION_2=1 \
 	-DENABLE_PLUGIN_PROCESS=1 \
 	-DLIBEXECDIR=\""$(libexecdir)"\" \
-	-std=c++11 \
 	$(global_cppflags) \
 	$(platform_cppflags) \
 	$(platformgtk_cppflags) \

Modified: trunk/Source/autotools/SetupCompilerFlags.m4 (150444 => 150445)


--- trunk/Source/autotools/SetupCompilerFlags.m4	2013-05-21 16:03:07 UTC (rev 150444)
+++ trunk/Source/autotools/SetupCompilerFlags.m4	2013-05-21 16:05:31 UTC (rev 150445)
@@ -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
+
+# 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.
-# libstdc++ is at the moment the only option as the C++ standard library when compiling with Clang.
+# 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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to