Amend b280fed1: 3rdparty/dtl: Use preprocessor value on Windows

[lyx.git] / src / TexRow.h

diff --git a/src/TexRow.h b/src/TexRow.h
index 9797ffd493cedf6919c1211ae599c6e52011834f..8edcd8eb16515146fb8230cc34dd548bcdf3f7d8 100644 (file)
--- a/src/TexRow.h
+++ b/src/TexRow.h
@@ -29,6 +29,7 @@
 #define TEXROW_H
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 #include <vector>
@@ -118,7 +119,6 @@ public:
        ///
        TexRow();
 
-#if !(defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 6))
        /// Copy can be expensive and is not usually useful for TexRow.
        /// Force explicit copy, prefer move instead. This also prevents
        /// move()s from being converted into copy silently.
@@ -126,10 +126,6 @@ public:
        TexRow(TexRow && other) = default;
        TexRow & operator=(TexRow const & other) = default;
        TexRow & operator=(TexRow && other) = default;
-# else
-       //for gcc 4.6, nothing to do: it's enough to disable implicit copy during
-       // dev with more recent versions of gcc.
-#endif
 
        /// Clears structure.
        void reset();
@@ -240,7 +236,6 @@ struct TexString {
        docstring str;
        ///
        TexRow texrow;
-#if !(defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 6))
        /// Copy can be expensive and is not usually useful for TexString.
        /// Force explicit copy, prefer move instead. This also prevents
        /// move()s from being converted into copy silently.
@@ -248,10 +243,6 @@ struct TexString {
        TexString(TexString && other) = default;
        TexString & operator=(TexString const & other) = default;
        TexString & operator=(TexString && other) = default;
-# else
-       //for gcc 4.6, nothing to do: it's enough to disable implicit copy during
-       // dev with more recent versions of gcc.
-#endif
        /// Empty TexString
        TexString() = default;
        /// Texstring containing str and TexRow with enough lines which are empty