X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTexRow.h;h=e40867d7b1416f113ca41d448655729bc1ced685;hb=e11c7cb71da01989da9370c10e30af0c6a21a1f4;hp=9797ffd493cedf6919c1211ae599c6e52011834f;hpb=68b034f51f3f311c97d636482340f256bc5464ec;p=lyx.git

diff --git a/src/TexRow.h b/src/TexRow.h
index 9797ffd493..e40867d7b1 100644
--- a/src/TexRow.h
+++ b/src/TexRow.h
@@ -28,7 +28,7 @@
 #ifndef TEXROW_H
 #define TEXROW_H
 
-#include "support/debug.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 #include <vector>
@@ -42,10 +42,6 @@ class DocIterator;
 class docstring_list;
 class FuncRequest;
 
-/// types for cells and math insets
-typedef void const * uid_type;
-typedef size_t idx_type;
-
 
 /// Represents the correspondence between paragraphs and the generated
 /// LaTeX file
@@ -118,7 +114,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 +121,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 +231,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 +238,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