Amend efc0877f

[features.git] / src / support / RefChanger.h

diff --git a/src/support/RefChanger.h b/src/support/RefChanger.h
index 65bb78106cd95ab19477dc64505aaf47b2b51206..ae35cc3891424b5f0b685259222e6ca59197a880 100644 (file)
--- a/src/support/RefChanger.h
+++ b/src/support/RefChanger.h
@@ -35,9 +35,9 @@ public:
        //
        ~RevertibleRef() { revert(); }
        //
-       void revert() { if (enabled) { enabled = false; ref = old; } }
+       void revert() override { if (enabled) { enabled = false; ref = old; } }
        //
-       void keep() { enabled = false; }
+       void keep() override { enabled = false; }
        //
        X & ref;
        X const old;
@@ -46,18 +46,7 @@ private:
 };
 
 
-//for gcc 4.6
-#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 6)
-template <typename X>
-struct RefChanger : unique_ptr<RevertibleRef<X>>
-{
-       RefChanger(unique_ptr<RevertibleRef<X>> p)
-               : unique_ptr<RevertibleRef<X>>(move(p))
-               {}
-};
-#else
 template <typename X> using RefChanger = unique_ptr<RevertibleRef<X>>;
-#endif
 
 
 /// Saves the value of \param ref in a movable object