Bug 923170 - Require GCC 4.6.x before enabling strong enum support. r=Waldo
authorGian-Carlo Pascutto <gpascutto@mozilla.com>
Tue, 08 Oct 2013 15:25:13 -0400
changeset 163927 657aa2568bc2ea0cc586b64f897f43dca93412b8
parent 163926 4b21fe65487a8f8f38a883bb0af78f80e1f49351
child 163928 94fe8b4a15665375bb57693d48be572b8b0eba7a
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersWaldo
bugs923170
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 923170 - Require GCC 4.6.x before enabling strong enum support. r=Waldo
gfx/thebes/gfxDrawable.cpp
mfbt/TypedEnum.h
--- a/gfx/thebes/gfxDrawable.cpp
+++ b/gfx/thebes/gfxDrawable.cpp
@@ -73,17 +73,17 @@ PreparePatternForUntiledDrawing(gfxPatte
             // enable EXTEND_PAD provided that we're running on a recent
             // enough X server.
             if (static_cast<gfxXlibSurface*>(currentTarget)->IsPadSlow()) {
                 bool isDownscale =
                     aDeviceToImage.xx >= 1.0 && aDeviceToImage.yy >= 1.0 &&
                     aDeviceToImage.xy == 0.0 && aDeviceToImage.yx == 0.0;
 
                 GraphicsFilter filter =
-                    isDownscale ? aDefaultFilter : GraphicsFilter::FILTER_FAST;
+                    isDownscale ? aDefaultFilter : (const GraphicsFilter)GraphicsFilter::FILTER_FAST;
                 aPattern->SetFilter(filter);
 
                 // Use the default EXTEND_NONE
                 break;
             }
             // else fall through to EXTEND_PAD and the default filter.
         }
 #endif
--- a/mfbt/TypedEnum.h
+++ b/mfbt/TypedEnum.h
@@ -23,17 +23,17 @@
 #    define __has_extension __has_feature /* compatibility, for older versions of clang */
 #  endif
 #  if __has_extension(cxx_strong_enums)
 #    define MOZ_HAVE_CXX11_ENUM_TYPE
 #    define MOZ_HAVE_CXX11_STRONG_ENUMS
 #  endif
 #elif defined(__GNUC__)
 #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
-#    if MOZ_GCC_VERSION_AT_LEAST(4, 5, 1)
+#    if MOZ_GCC_VERSION_AT_LEAST(4, 6, 3)
 #      define MOZ_HAVE_CXX11_ENUM_TYPE
 #      define MOZ_HAVE_CXX11_STRONG_ENUMS
 #    endif
 #  endif
 #elif defined(_MSC_VER)
 #  if _MSC_VER >= 1400
 #    define MOZ_HAVE_CXX11_ENUM_TYPE
 #  endif