aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authormitchell <unknown>2019-04-30 16:29:32 -0400
committermitchell <unknown>2019-04-30 16:29:32 -0400
commitf8a0a8c56791a6d4bf0d0c5d20eb49f4c9a5b5f3 (patch)
tree963c780fe90ee9908a43697f916188940845779a /src
parent3c7a5c0559aeb74dbb6fa9c76d4a3155ce0f58e8 (diff)
downloadscintilla-mirror-f8a0a8c56791a6d4bf0d0c5d20eb49f4c9a5b5f3.tar.gz
Fixed bad backport involving noexcept move constructors for GCC 4.8.
Diffstat (limited to 'src')
-rw-r--r--src/XPM.h8
1 files changed, 4 insertions, 4 deletions
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; }