From a4027f9f8fdf4ab9efc984f88b945c9911e583b6 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Mon, 29 Apr 2019 13:32:11 +0200 Subject: [PATCH] scintilla: Fix GCC 4.8 support wrt noexcept move constructors X-Scintilla-Commit-ID: ee3fe56c6fe815781d02fbc7d55d9f15f9c439aa --- scintilla/src/XPM.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scintilla/src/XPM.h b/scintilla/src/XPM.h index b7b895cd..9ff612d6 100644 --- a/scintilla/src/XPM.h +++ b/scintilla/src/XPM.h @@ -26,9 +26,9 @@ public: explicit XPM(const char *textForm); explicit XPM(const char *const *linesForm); XPM(const XPM &) = default; - XPM(XPM &&) noexcept = default; + XPM(XPM &&) = default; XPM &operator=(const XPM &) = default; - XPM &operator=(XPM &&) noexcept = default; + XPM &operator=(XPM &&) = default; ~XPM(); void Init(const char *textForm); void Init(const char *const *linesForm); @@ -53,9 +53,9 @@ public: RGBAImage(int width_, int height_, float scale_, const unsigned char *pixels_); explicit RGBAImage(const XPM &xpm); RGBAImage(const RGBAImage &) = default; - RGBAImage(RGBAImage &&) noexcept = default; + RGBAImage(RGBAImage &&) = default; RGBAImage &operator=(const RGBAImage &) = default; - RGBAImage &operator=(RGBAImage &&) noexcept = default; + RGBAImage &operator=(RGBAImage &&) = default; virtual ~RGBAImage(); int GetHeight() const { return height; } int GetWidth() const { return width; }