From f8a0a8c56791a6d4bf0d0c5d20eb49f4c9a5b5f3 Mon Sep 17 00:00:00 2001 From: mitchell Date: Tue, 30 Apr 2019 16:29:32 -0400 Subject: Fixed bad backport involving noexcept move constructors for GCC 4.8. --- src/XPM.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/XPM.h b/src/XPM.h index b7b895cdd..9ff612d64 100644 --- a/src/XPM.h +++ b/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; } -- cgit v1.2.3