Merged compilation does not exist anymore.

https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg223072.html

INSTALL

@@ -53,7 +53,7 @@ Requirements
 ------------
 
 First of all, you will need a C++11 standard conforming compiler, like g++ (at
-least 4.9, to have proper srd::regex) or clang++.
+least 5.0, to have proper std::regex & std::string) or clang++.
 
 LyX makes great use of the C++ Standard Library. This means that gcc
 users will have to install the relevant libstdc++ library to be able

README

@@ -87,8 +87,8 @@ How do I upgrade from an earlier LyX version?
 What do I need to compile LyX from the source distribution?
 
     * A C++11 compiler. Development is being done mainly with gcc/g++,
-      but clang and MSVC are known to work too. As of LyX 2.4.0, you
+      but clang and MSVC are known to work too. As of LyX 2.5.0, you
-      need at least gcc 4.9.
+      need at least gcc 5.0.
 
     * The Qt library, at least version 5.2 (5.6 recommended). It is
       also possible to compile with Qt 6.x.

development/cmake/configCompiler.h.msvc

@@ -168,9 +168,4 @@
 #define HAVE_MODE_T
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
-#include "support/strfwd.h" // always first, to prevent compiler's interpretation/instantiations of some typedef
-#endif
-
-
 #endif

lib/RELEASE-NOTES

@@ -38,6 +38,8 @@
 
 - The support for (long unmaintained) eLyXer was removed.
 
+- When compiling with GCC, LyX know needs at least version >= 5.
+
 
 !!Known issues in version 2.5.0
 

src/Box.h

@@ -12,7 +12,7 @@
 #ifndef BOX_H
 #define BOX_H
 
-#include "support/strfwd.h"
+#include <ostream>
 
 
 namespace lyx {

src/Buffer.h

@@ -16,13 +16,12 @@
 #include "OutputEnums.h"
 
 #include "support/unique_ptr.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 #include <map>
 #include <list>
 #include <set>
-#include <string>
 #include <vector>
 
 

src/BufferEncodings.h

@@ -16,8 +16,6 @@
 
 #include "Encoding.h"
 
-#include "support/strfwd.h"
-
 namespace lyx {
 
 class Buffer;

src/BufferList.h

@@ -12,8 +12,7 @@
 #ifndef BUFFER_LIST_H
 #define BUFFER_LIST_H
 
-#include "support/strfwd.h"
+#include <string>
-
 #include <vector>
 
 

src/BufferView.h

@@ -20,7 +20,6 @@
 #include "TexRow.h"
 #include "update_flags.h"
 
-#include "support/strfwd.h"
 #include "support/types.h"
 
 namespace lyx {

src/Changes.h

@@ -15,7 +15,6 @@
 #ifndef CHANGES_H
 #define CHANGES_H
 
-#include "support/strfwd.h"
 #include "support/types.h"
 #include "support/lyxtime.h"
 

src/Citation.h

@@ -13,7 +13,6 @@
 #define CITATION_H
 
 #include "support/docstring.h"
-#include <string>
 #include <vector>
 
 namespace lyx {

src/CmdDef.h

@@ -12,10 +12,9 @@
 #ifndef CMDDEF_H
 #define CMDDEF_H
 
-#include "support/strfwd.h"
-
 #include <map>
 #include <set>
+#include <string>
 
 namespace lyx {
 

src/Color.h

@@ -21,7 +21,7 @@
 
 #include "ColorCode.h"
 
-#include "support/strfwd.h"
+#include <string>
 
 namespace lyx {
 

src/ColorSet.h

@@ -19,10 +19,10 @@
 #ifndef COLORSET_H
 #define COLORSET_H
 
+#include "support/docstring.h"
 #include "Color.h"
 
 #include <map>
-#include <string>
 
 namespace lyx {
 

src/Converter.h

@@ -13,12 +13,11 @@
 #define CONVERTER_H
 
 #include "Graph.h"
-#include "support/trivstring.h"
+#include "support/docstring.h"
 
 #include <memory>
 #include <vector>
 #include <set>
-#include <string>
 
 
 namespace lyx {

src/ConverterCache.h

@@ -21,7 +21,7 @@
 #ifndef CONVERTERCACHE_H
 #define CONVERTERCACHE_H
 
-#include "support/strfwd.h"
+#include <string>
 
 
 namespace lyx {

src/CursorSlice.h

@@ -18,7 +18,6 @@
 #define CURSORSLICE_H
 
 #include "support/types.h"
-#include "support/strfwd.h"
 #include "insets/Inset.h"
 
 

src/CutAndPaste.h

@@ -17,7 +17,6 @@
 #include "Author.h"
 #include "DocumentClassPtr.h"
 
-#include "support/strfwd.h"
 #include "support/types.h"
 
 #include "frontends/Clipboard.h"

src/Encoding.h

@@ -14,7 +14,6 @@
 #define ENCODING_H
 
 #include "support/docstring.h"
-#include "support/trivstring.h"
 #include "support/types.h"
 
 #include <map>

src/ErrorList.h

@@ -14,8 +14,6 @@
 
 #include "TexRow.h"
 
-#include "support/strfwd.h"
-
 #include <vector>
 
 

src/Floating.h

@@ -12,10 +12,7 @@
 #ifndef FLOATING_H
 #define FLOATING_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
-
-#include <string>
-
 
 namespace lyx {
 

src/Font.h

@@ -17,8 +17,6 @@
 
 #include "FontInfo.h"
 
-#include "support/strfwd.h"
-
 
 namespace lyx {
 

src/FontInfo.cpp

@@ -27,7 +27,6 @@
 #include "support/lstrings.h"
 
 #include <algorithm>
-#include <ostream>
 #include <sstream>
 
 using namespace std;

src/FontInfo.h

@@ -20,7 +20,7 @@
 #include "FontEnums.h"
 
 #include "support/Changer.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {

src/Format.h

@@ -12,11 +12,9 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
-#include "support/trivstring.h"
 
 #include <vector>
-#include <string>
 
 namespace lyx {
 

src/KeyMap.h

@@ -17,8 +17,6 @@
 #include "FuncRequest.h"
 #include "KeySequence.h"
 
-#include "support/strfwd.h"
-
 #include <memory>
 #include <vector>
 

src/LaTeX.h

@@ -16,7 +16,6 @@
 
 #include "OutputParams.h"
 
-#include "support/strfwd.h"
 #include "support/FileName.h"
 #include "support/signals.h"
 

src/Language.h

@@ -16,7 +16,6 @@
 #define LANGUAGE_H
 
 #include "support/docstring.h"
-#include "support/trivstring.h"
 
 #include <map>
 #include <set>

src/Layout.h

@@ -22,7 +22,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 
 namespace lyx {
 

src/LayoutFile.h

@@ -15,8 +15,6 @@
 
 #include "TextClass.h"
 
-#include "support/strfwd.h"
-
 #include <string>
 #include <vector>
 

src/LyX.h

@@ -14,8 +14,7 @@
 #ifndef LYX_H
 #define LYX_H
 
-#include "support/strfwd.h"
+#include <string>
-
 #include <vector>
 
 namespace lyx {

src/LyXRC.h

@@ -22,7 +22,6 @@
 #include "update_flags.h"
 
 #include "support/Length.h"
-#include "support/strfwd.h"
 #include "support/userinfo.h"
 
 #include <map>

src/LyXVC.h

@@ -15,8 +15,6 @@
 #include "support/docstring.h"
 #include "support/unique_ptr.h"
 
-#include <string>
-
 
 namespace lyx {
 

src/MetricsInfo.h

@@ -17,7 +17,6 @@
 #include "ColorCode.h"
 #include "FontInfo.h"
 
-#include "support/strfwd.h"
 #include "support/Changer.h"
 
 #include "insets/Inset.h"

src/PDFOptions.cpp

@@ -26,7 +26,6 @@
 #include "support/lstrings.h"
 
 #include <sstream>
-#include <string>
 #include <algorithm>
 
 using namespace std;

src/Paragraph.h

@@ -19,7 +19,6 @@
 #include "LayoutEnums.h"
 #include "SpellChecker.h"
 
-#include "support/strfwd.h"
 #include "support/types.h"
 
 #include "insets/InsetCode.h"

src/ParagraphParameters.h

@@ -18,7 +18,6 @@
 #include "Spacing.h"
 
 #include "support/types.h"
-#include "support/strfwd.h"
 #include "support/Length.h"
 
 

src/PersonalWordList.h

@@ -12,7 +12,6 @@
 #ifndef PERSONAL_WORD_LIST_H
 #define PERSONAL_WORD_LIST_H
 
-#include "support/strfwd.h"
 #include "support/docstring_list.h"
 #include "support/FileName.h"
 

src/Spacing.h

@@ -12,8 +12,6 @@
 #ifndef SPACING_H
 #define SPACING_H
 
-#include "support/strfwd.h"
-
 #include <string>
 
 namespace lyx {

src/SpellChecker.h

@@ -13,7 +13,7 @@
 #ifndef SPELL_BASE_H
 #define SPELL_BASE_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include <vector>
 
 

src/Statistics.h

@@ -12,7 +12,7 @@
 #ifndef STATISTICS_H
 #define STATISTICS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 namespace lyx {

src/TextClass.h

@@ -26,7 +26,6 @@
 #include <list>
 #include <map>
 #include <set>
-#include <string>
 #include <vector>
 
 #ifdef ERROR

src/Thesaurus.h

@@ -13,7 +13,7 @@
 #ifndef THESAURUS_H
 #define THESAURUS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <map>
 #include <vector>

src/TocBackend.h

@@ -21,7 +21,6 @@
 #include "Toc.h"
 #include "TocBuilder.h"
 
-#include "support/strfwd.h"
 #include "support/unique_ptr.h"
 
 

src/TocBuilder.h

@@ -14,7 +14,7 @@
 
 #include "Toc.h"
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <stack>
 

src/frontends/Application.h

@@ -15,7 +15,7 @@
 #include "FuncCode.h"
 #include "update_flags.h"
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <functional>
 

src/frontends/Clipboard.h

@@ -14,8 +14,6 @@
 #ifndef BASE_CLIPBOARD_H
 #define BASE_CLIPBOARD_H
 
-#include "support/strfwd.h"
-
 namespace lyx {
 
 class Cursor;

src/frontends/Delegates.h

@@ -12,7 +12,7 @@
 #ifndef DELEGATES_H
 #define DELEGATES_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

src/frontends/FontLoader.h

@@ -12,7 +12,7 @@
 #ifndef FONTLOADER_H
 #define FONTLOADER_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

src/frontends/FontMetrics.h

@@ -16,7 +16,7 @@
 
 
 #include "support/mute_warning.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <vector>
 

src/frontends/Painter.h

@@ -13,7 +13,7 @@
 #ifndef PAINTER_H
 #define PAINTER_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 namespace lyx {

src/frontends/Selection.h

@@ -14,7 +14,7 @@
 #ifndef SELECTION_H
 #define SELECTION_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 namespace frontend {

src/frontends/alert.h

@@ -12,7 +12,7 @@
 #ifndef LYX_ALERT_H
 #define LYX_ALERT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {

src/frontends/qt/CategorizedCombo.h

@@ -17,8 +17,6 @@
 #ifndef LYX_CATEGORIZEDCOMBO_H
 #define LYX_CATEGORIZEDCOMBO_H
 
-#include "support/strfwd.h"
-
 #include <QComboBox>
 
 

src/frontends/qt/Dialog.h

@@ -16,8 +16,6 @@
 
 #include "insets/InsetCode.h"
 
-#include "support/strfwd.h"
-
 #include <QString>
 
 class QSettings;

src/frontends/qt/FindAndReplace.h

@@ -18,7 +18,6 @@
 #include "ui_FindAndReplaceUi.h"
 #include "support/docstring.h"
 
-#include <string>
 
 namespace lyx {
 

src/frontends/qt/GuiCitation.cpp

@@ -49,7 +49,6 @@
 
 #include <algorithm>
 #include <regex>
-#include <string>
 #include <vector>
 
 using namespace std;

src/frontends/qt/GuiDelimiter.cpp

@@ -34,7 +34,6 @@
 #include <QScrollBar>
 
 #include <map>
-#include <string>
 
 using namespace std;
 

src/frontends/qt/GuiDelimiter.h

@@ -12,6 +12,8 @@
 #ifndef GUIDELIMITERDIALOG_H
 #define GUIDELIMITERDIALOG_H
 
+#include "support/docstring.h"
+
 #include "GuiDialog.h"
 
 #include "ui_DelimiterUi.h"

src/frontends/qt/GuiSymbols.h

@@ -12,11 +12,12 @@
 #ifndef GUISYMBOLSDIALOG_H
 #define GUISYMBOLSDIALOG_H
 
+#include "support/docstring.h"
+
 #include "DialogView.h"
 #include "ui_SymbolsUi.h"
 
 #include <map>
-#include <string>
 #include <vector>
 
 namespace lyx {

src/frontends/qt/GuiToolbar.h

@@ -20,8 +20,6 @@
 #include <QToolBar>
 #include <QToolButton>
 
-#include "support/strfwd.h"
-
 class QSettings;
 
 namespace lyx {

src/frontends/qt/GuiView.cpp

@@ -4437,8 +4437,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		case LFUN_BUFFER_EXPORT: {
 			if (!doc_buffer)
 				break;
-			// GCC only sees strfwd.h when building merged
+			if (cmd.argument() == "custom") {
-			if (::lyx::operator==(cmd.argument(), "custom")) {
 				// LFUN_MASTER_BUFFER_EXPORT is not enabled for this case,
 				// so the following test should not be needed.
 				// In principle, we could try to switch to such a view...

src/frontends/qt/GuiView.h

@@ -17,8 +17,6 @@
 
 #include "frontends/Delegates.h"
 
-#include "support/strfwd.h"
-
 #include <QMainWindow>
 #include <QLabel>
 #include <QMenu>

src/frontends/qt/InsetParamsDialog.h

@@ -12,6 +12,8 @@
 #ifndef INSET_PARAMS_DIALOG_H
 #define INSET_PARAMS_DIALOG_H
 
+#include "support/docstring.h"
+
 #include "DialogView.h"
 #include "ui_InsetParamsUi.h"
 

src/frontends/qt/InsetParamsWidget.h

@@ -16,7 +16,7 @@
 
 #include "FuncCode.h"
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <QWidget>
 

src/frontends/qt/LayoutBox.h

@@ -16,7 +16,7 @@
 #ifndef LYX_LAYOUT_BOX_H
 #define LYX_LAYOUT_BOX_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <QComboBox>
 

src/graphics/GraphicsTypes.h

@@ -15,9 +15,6 @@
 #ifndef GRAPHICSTYPES_H
 #define GRAPHICSTYPES_H
 
-#include "support/strfwd.h"
-
-
 namespace lyx {
 namespace graphics {
 

src/graphics/PreviewImage.h

@@ -12,7 +12,7 @@
 #ifndef PREVIEWIMAGE_H
 #define PREVIEWIMAGE_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

src/insets/Inset.h

@@ -24,7 +24,6 @@
 #include "RowFlags.h"
 
 #include "support/docstring.h"
-#include "support/strfwd.h"
 #include "support/types.h"
 
 #include <climits>

src/insets/InsetCommandParams.h

@@ -18,7 +18,6 @@
 
 #include "support/docstring.h"
 
-#include <string>
 #include <vector>
 #include <map>
 

src/insets/InsetLayout.h

@@ -20,7 +20,6 @@
 #include "support/docstring.h"
 
 #include <set>
-#include <string>
 
 namespace lyx {
 

src/lyxfind.h

@@ -16,8 +16,6 @@
 #ifndef LYXFIND_H
 #define LYXFIND_H
 
-#include "support/strfwd.h"
-
 // FIXME
 #include "support/docstring.h"
 

src/mathed/InsetMathDecoration.cpp

@@ -30,7 +30,6 @@
 #include "support/lstrings.h"
 
 #include <algorithm>
-#include <ostream>
 
 using namespace lyx::support;
 

src/mathed/InsetMathMatrix.h

@@ -13,7 +13,6 @@
 #define MATH_MATRIXINSET_H
 
 #include "InsetMathGrid.h"
-#include "support/strfwd.h"
 
 
 namespace lyx {

src/mathed/MathAutoCorrect.h

@@ -12,7 +12,7 @@
 #ifndef MATHAUTOCORRECT_H
 #define MATHAUTOCORRECT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

src/mathed/MathClass.cpp

@@ -20,8 +20,6 @@
 #include "support/docstring.h"
 #include "support/lassert.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {

src/mathed/MathClass.h

@@ -12,7 +12,7 @@
 #ifndef MATH_CLASS_H
 #define MATH_CLASS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

src/mathed/MathData.h

@@ -21,8 +21,6 @@
 #include "Dimension.h"
 #include "OutputEnums.h"
 
-#include "support/strfwd.h"
-
 #include <cstddef>
 #include <vector>
 

src/mathed/MathExtern.h

@@ -12,7 +12,7 @@
 #ifndef MATH_EXTERN_H
 #define MATH_EXTERN_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

src/mathed/MathFactory.h

@@ -14,8 +14,6 @@
 
 #include "MathParser.h"
 
-#include "support/strfwd.h"
-
 #include <map>
 
 namespace lyx {

src/mathed/MathStream.cpp

@@ -25,7 +25,6 @@
 
 #include <algorithm>
 #include <cstring>
-#include <ostream>
 #include <FontInfo.h>
 
 using namespace std;

src/mathed/MathStream.h

@@ -19,7 +19,6 @@
 #include "texstream.h"
 
 #include "support/Changer.h"
-#include "support/strfwd.h"
 
 
 namespace lyx {

src/mathed/MathSupport.h

@@ -14,7 +14,7 @@
 #define MATH_SUPPORT_H
 
 #include "MathParser_flags.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

src/output_docbook.h

@@ -28,7 +28,6 @@
 #include "ParagraphList.h"
 
 #include "support/docstream.h"
-#include "support/strfwd.h"
 #include "xml.h"
 
 namespace lyx {

src/output_plaintext.h

@@ -12,7 +12,7 @@
 #ifndef OUTPUT_PLAINTEXT_H
 #define OUTPUT_PLAINTEXT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 #include <climits>

src/output_xhtml.h

@@ -14,7 +14,6 @@
 
 #include "LayoutEnums.h"
 
-#include "support/strfwd.h"
 #include "xml.h"
 
 

src/support/ConsoleApplication.h

@@ -11,7 +11,7 @@
 #ifndef CONSOLEAPPLICATION_H
 #define CONSOLEAPPLICATION_H
 
-#include "support/strfwd.h"
+#include <string>
 
 namespace lyx {
 

src/support/FileName.h

@@ -13,7 +13,6 @@
 #define FILENAME_H
 
 #include "support/os.h"
-#include "support/strfwd.h"
 
 #include <ctime>
 #include <set>

src/support/ForkedCalls.h

@@ -15,7 +15,7 @@
 #define FORKEDCALLS_H
 
 #include "support/signals.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>

src/support/Length.h

@@ -15,7 +15,7 @@
 #ifndef LENGTH_H
 #define LENGTH_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {

src/support/Lexer.h

@@ -17,8 +17,7 @@
 #ifndef LEXER_H
 #define LEXER_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
-#include <string>
 
 namespace lyx {
 

src/support/Makefile.am

@@ -106,7 +106,6 @@ liblyxsupport_a_SOURCES = \
 	signals.h \
 	socktools.cpp \
 	socktools.h \
-	strfwd.h \
 	Systemcall.cpp \
 	Systemcall.h \
 	SystemcallPrivate.h \
@@ -116,8 +115,6 @@ liblyxsupport_a_SOURCES = \
 	Translator.h \
 	Timeout.cpp \
 	Timeout.h \
-	trivstring.cpp \
-	trivstring.h \
 	types.h \
 	unique_ptr.h \
 	userinfo.cpp \

src/support/Messages.h

@@ -14,7 +14,6 @@
 #include "support/docstring.h"
 
 #include <map>
-#include <string>
 
 namespace lyx {
 

src/support/ProgressInterface.h

@@ -12,7 +12,7 @@
 #ifndef LYX_SUPPORT_PROGRESSINTERFACE_H
 #define LYX_SUPPORT_PROGRESSINTERFACE_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 class QString;
 

src/support/Systemcall.h

@@ -15,8 +15,6 @@
 #ifndef SYSTEMCALL_H
 #define SYSTEMCALL_H
 
-#include "strfwd.h"
-
 namespace lyx {
 namespace support {
 

src/support/convert.cpp

@@ -14,7 +14,6 @@
 #include "support/convert.h"
 #include "support/docstring.h"
 
-#include <string>
 #include <sstream>
 //needed for Mac OSX 10.5.2 Leopard
 #include <cstdlib>

src/support/convert.h

@@ -16,7 +16,7 @@
 #ifndef CONVERT_H
 #define CONVERT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

src/support/counter_reps.h

@@ -17,7 +17,7 @@
 #ifndef COUNTER_REPS_H
 #define COUNTER_REPS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

src/support/debug.h

@@ -15,7 +15,7 @@
 #ifndef LYXDEBUG_H
 #define LYXDEBUG_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 // Forward definitions do not work with libc++
 // but ios_base has already been defined in strfwd

src/support/docstring.h

@@ -13,12 +13,68 @@
 #ifndef LYX_DOCSTRING_H
 #define LYX_DOCSTRING_H
 
-#include "support/strfwd.h"
+#ifdef USE_WCHAR_T
+
+// Prefer this if possible because GNU libstdc++ has usable
+// std::ctype<wchar_t> locale facets but not
+// std::ctype<boost::uint32_t>. gcc older than 3.4 is also missing
+// usable std::char_traits<boost::uint32_t>.
+namespace lyx { typedef wchar_t char_type; }
+
+#else
+
+#include <cstdint>
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+namespace lyx { typedef uint32_t char_type; }
+#include "support/numpunct_lyx_char_type.h" // implementation for our char_type needed
+#else
+namespace lyx { typedef std::uint32_t char_type; }
+#endif
+
+#endif
 
 #include <string>
 
 namespace lyx {
 
+/**
+ * String type for storing the main text in UCS4 encoding.
+ * Use std::string only in cases 7-bit ASCII is to be manipulated
+ * within the variable.
+ */
+typedef std::basic_string<char_type, std::char_traits<char_type>,
+	std::allocator<char_type> > docstring;
+
+/// Base class for UCS4 input streams
+typedef std::basic_istream<char_type, std::char_traits<char_type> > idocstream;
+
+/// Base class for UCS4 output streams
+typedef std::basic_ostream<char_type, std::char_traits<char_type> > odocstream;
+
+/// UCS4 output stringstream
+typedef std::basic_ostringstream<char_type, std::char_traits<char_type>, std::allocator<char_type> > odocstringstream;
+
+#if ! defined(USE_WCHAR_T)
+extern odocstream & operator<<(odocstream &, char);
+#endif
+
+// defined in lstrings.cpp
+docstring const & empty_docstring();
+std::string const & empty_string();
+// defined in docstring.cpp
+bool operator==(docstring const &, char const *);
+
+//trivstring signalizes thread-safety request; should not be needed for any
+//C++11 conformant std::basic_string, e.g. GCC >= 5.
+//Once properly tested we can ditch these two in favour of std::string/docstring.
+typedef std::string trivstring;
+typedef docstring trivdocstring;
+
+} // namespace lyx
+
+namespace lyx {
+
 /// Creates a docstring from a C string of ASCII characters
 docstring const from_ascii(char const *);