From ee7d78d1dc25f7ae4fd876264bb5bd6bba004b81 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Fri, 21 Apr 2017 22:41:03 -0400 Subject: [PATCH] Revert "Mover.h: let move be defined" This reverts commit d4ea07705a88089519b80db3307a7d940fbae40d. d4ea0770 lead to a compile error with gcc 4.6. The error is likely due to that version's weak C++11 support. This commit reverts d4ea0770 in order to preserve compilation with gcc 4.6 for alpha1. --- src/Mover.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Mover.h b/src/Mover.h index e432a3d349..4d1c1c7900 100644 --- a/src/Mover.h +++ b/src/Mover.h @@ -27,13 +27,7 @@ namespace support { class FileName; } class Mover { public: - virtual ~Mover() = default; - Mover(Mover &&) = default; - Mover & operator=(Mover &&) = default; - Mover(Mover const &) = default; - Mover & operator=(Mover const &) = default; - - Mover() = default; + virtual ~Mover() {} /** Copy file @c from to @c to. * This version should be used to copy files from the original @@ -115,7 +109,9 @@ protected: class SpecialisedMover : public Mover { public: - SpecialisedMover() = default; + SpecialisedMover() {} + + virtual ~SpecialisedMover() {} /** @c command should be of the form * -- 2.39.2