Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (88359 => 88360)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-08 18:03:07 UTC (rev 88359)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-08 18:04:43 UTC (rev 88360)
@@ -1,3 +1,14 @@
+2011-06-08 Ryan Sleevi <rsle...@chromium.org>
+
+ Reviewed by Tony Chang.
+
+ Suppress C++0x compat warnings when compiling Chromium port with GCC 4.6
+
+ Compiling Chromium port under GCC 4.6 produces warnings about nullptr
+ https://bugs.webkit.org/show_bug.cgi?id=62242
+
+ * _javascript_Core.gyp/_javascript_Core.gyp:
+
2011-06-08 Ademar de Souza Reis Jr. <ademar.r...@openbossa.org>
Reviewed by Andreas Kling.
Modified: trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp (88359 => 88360)
--- trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp 2011-06-08 18:03:07 UTC (rev 88359)
+++ trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp 2011-06-08 18:04:43 UTC (rev 88360)
@@ -47,6 +47,15 @@
}],
],
},
+ 'conditions': [
+ ['os_posix == 1 and OS != "mac" and gcc_version==46', {
+ 'target_defaults': {
+ # Disable warnings about c++0x compatibility, as some names (such as nullptr) conflict
+ # with upcoming c++0x types.
+ 'cflags_cc': ['-Wno-c++0x-compat'],
+ },
+ }],
+ ],
'targets': [
{
# This target sets up defines and includes that are required by WTF and
@@ -236,3 +245,9 @@
},
], # targets
}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
Modified: trunk/Source/WebCore/ChangeLog (88359 => 88360)
--- trunk/Source/WebCore/ChangeLog 2011-06-08 18:03:07 UTC (rev 88359)
+++ trunk/Source/WebCore/ChangeLog 2011-06-08 18:04:43 UTC (rev 88360)
@@ -1,3 +1,14 @@
+2011-06-08 Ryan Sleevi <rsle...@chromium.org>
+
+ Reviewed by Tony Chang.
+
+ Suppress C++0x compat warnings when compiling Chromium port with GCC 4.6
+
+ Compiling Chromium port under GCC 4.6 produces warnings about nullptr
+ https://bugs.webkit.org/show_bug.cgi?id=62242
+
+ * WebCore.gyp/WebCore.gyp:
+
2011-05-25 Xiaomei Ji <x...@chromium.org>
Reviewed by Ryosuke Niwa.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (88359 => 88360)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-06-08 18:03:07 UTC (rev 88359)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-06-08 18:04:43 UTC (rev 88360)
@@ -106,6 +106,13 @@
'cflags!': ['-g'],
},
}],
+ ['os_posix==1 and OS!="mac" and gcc_version==46', {
+ 'target_defaults': {
+ # Disable warnings about c++0x compatibility, as some names (such as nullptr) conflict
+ # with upcoming c++0x types.
+ 'cflags_cc': ['-Wno-c++0x-compat'],
+ },
+ }],
['OS=="linux" and target_arch=="arm"', {
# Due to a bug in gcc arm, we get warnings about uninitialized timesNewRoman.unstatic.3258
# and colorTransparent.unstatic.4879.
Modified: trunk/Source/WebKit/chromium/ChangeLog (88359 => 88360)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-08 18:03:07 UTC (rev 88359)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-08 18:04:43 UTC (rev 88360)
@@ -1,3 +1,14 @@
+2011-06-08 Ryan Sleevi <rsle...@chromium.org>
+
+ Reviewed by Tony Chang.
+
+ Suppress C++0x compat warnings when compiling Chromium port with GCC 4.6
+
+ Compiling Chromium port under GCC 4.6 produces warnings about nullptr
+ https://bugs.webkit.org/show_bug.cgi?id=62242
+
+ * WebKit.gyp:
+
2011-06-08 Greg Simon <gregsi...@chromium.org>
Reviewed by Dimitri Glazkov.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (88359 => 88360)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-06-08 18:03:07 UTC (rev 88359)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-06-08 18:04:43 UTC (rev 88360)
@@ -1206,6 +1206,13 @@
'sources': ['../../../Tools/DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
}],
}],
+ ['os_posix==1 and OS!="mac" and gcc_version==46', {
+ 'target_defaults': {
+ # Disable warnings about c++0x compatibility, as some names (such
+ # as nullptr) conflict with upcoming c++0x types.
+ 'cflags_cc': ['-Wno-c++0x-compat'],
+ },
+ }],
['OS=="mac"', {
'targets': [
{
