[LyX/master] Make master compilable again with older gcc.

Pavel Sanda sanda at lyx.org
Tue Oct 20 21:33:08 UTC 2020


commit 5d0b1b640b97011ad2fdc8a80e1d68fa77d448e0
Author: Pavel Sanda <sanda at lyx.org>
Date:   Wed Oct 21 00:01:03 2020 +0200

    Make master compilable again with older gcc.
---
 src/Author.h        |    2 +-
 src/Bullet.cpp      |    1 -
 src/Bullet.h        |    2 +-
 src/Converter.h     |    2 +-
 src/Encoding.h      |    1 +
 src/Format.h        |    1 +
 src/FuncRequest.cpp |    1 -
 src/FuncRequest.h   |    2 +-
 src/FuncStatus.h    |    2 +-
 src/Language.h      |    1 +
 src/TexRow.h        |    2 +-
 11 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Author.h b/src/Author.h
index aa48b5d..798cfd8 100644
--- a/src/Author.h
+++ b/src/Author.h
@@ -12,7 +12,7 @@
 #ifndef AUTHOR_H
 #define AUTHOR_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <vector>
 
diff --git a/src/Bullet.cpp b/src/Bullet.cpp
index b3bf8e5..1f4ef6a 100644
--- a/src/Bullet.cpp
+++ b/src/Bullet.cpp
@@ -18,7 +18,6 @@
 
 #include "Bullet.h"
 
-#include "support/docstring.h"
 #include "support/lassert.h"
 
 using namespace std;
diff --git a/src/Bullet.h b/src/Bullet.h
index 8a6da2a..6a4f997 100644
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -13,7 +13,7 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {
diff --git a/src/Converter.h b/src/Converter.h
index 914b816..e9efa00 100644
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -14,7 +14,7 @@
 
 #include "Graph.h"
 #include "OutputParams.h"
-#include "support/strfwd.h"
+#include "support/trivstring.h"
 
 #include <vector>
 #include <set>
diff --git a/src/Encoding.h b/src/Encoding.h
index e35f0fd..bd919f6 100644
--- a/src/Encoding.h
+++ b/src/Encoding.h
@@ -14,6 +14,7 @@
 #define ENCODING_H
 
 #include "support/strfwd.h"
+#include "support/trivstring.h"
 #include "support/types.h"
 
 #include <map>
diff --git a/src/Format.h b/src/Format.h
index 44b3381..75a60fe 100644
--- a/src/Format.h
+++ b/src/Format.h
@@ -15,6 +15,7 @@
 #include "OutputParams.h"
 
 #include "support/strfwd.h"
+#include "support/trivstring.h"
 
 #include <vector>
 
diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index de93a9f..2049210 100644
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -14,7 +14,6 @@
 #include "LyXAction.h"
 
 #include "support/debug.h"
-#include "support/docstring.h"
 #include "support/lstrings.h"
 
 #include <climits>
diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index 6dfde4b..42829ae 100644
--- a/src/FuncRequest.h
+++ b/src/FuncRequest.h
@@ -14,7 +14,7 @@
 
 #include "FuncCode.h"
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include "frontends/KeyModifier.h"
 #include "frontends/mouse_state.h"
diff --git a/src/FuncStatus.h b/src/FuncStatus.h
index aba6eb8..4a632dc 100644
--- a/src/FuncStatus.h
+++ b/src/FuncStatus.h
@@ -12,7 +12,7 @@
 #ifndef FUNC_STATUS_H
 #define FUNC_STATUS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {
diff --git a/src/Language.h b/src/Language.h
index 0dba749..30173be 100644
--- a/src/Language.h
+++ b/src/Language.h
@@ -16,6 +16,7 @@
 #define LANGUAGE_H
 
 #include "support/strfwd.h"
+#include "support/trivstring.h"
 
 #include <map>
 #include <set>
diff --git a/src/TexRow.h b/src/TexRow.h
index d6617bf..2ca14d4 100644
--- a/src/TexRow.h
+++ b/src/TexRow.h
@@ -28,7 +28,7 @@
 #ifndef TEXROW_H
 #define TEXROW_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 #include <vector>


More information about the lyx-cvs mailing list