Am Sonntag 15 November 2015, 14:44:40 schrieb Kornel Benko:
> Cmake build: Using '-DLYX_MERGE_FILES=ON' I get this error:
>
> [ 46%] Building CXX object
> src/support/CMakeFiles/support.dir/_allinone_const.C.o cd
> /usr/BUILD/BuildLyxGitQtlocal/src/support && /usr/bin/c++
> -DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1 -DQT_CORE_LIB -DQT_GUI_LIB
> -I/usr/BUILD/BuildLyxGitQtlocal -I/usr/src/lyx/lyx-git/src
> -I/usr/include/enchant -I/usr/src/lyx/lyx-git/boost
> -I/usr/src/lyx/lyx-git/src/support
> -I/usr/BUILD/BuildLyxGitQtlocal/src/support
> -I/usr/src/lyx/lyx-git/src/support/mythes -isystem /usr/include/qt5
> -isystem /usr/include/qt5/QtCore -isystem
> /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -isystem
> /usr/include/qt5/QtGui -Wall -Wunused-parameter --std=c++11
> -fno-strict-aliasing -Wall -Wunused-parameter --std=c++11
> -fno-strict-aliasing -O0 -g3 -D_DEBUG -fPIC
> -DBOOST_USER_CONFIG="<config.h>" -o
> CMakeFiles/support.dir/_allinone_const.C.o -c
> /usr/BUILD/BuildLyxGitQtlocal/src/support/_allinone_const.C In file
> included from /usr/src/lyx/lyx-git/src/support/AppleScriptProxy.cpp:17:0,
> from /usr/BUILD/BuildLyxGitQtlocal/src/support/_allinone_const.C:48:
> /usr/src/lyx/lyx-git/src/LyX.h:124:18: error: reference to ‘ErrorItem’ is
> ambiguous void printError(ErrorItem const &);
> ^
> /usr/src/lyx/lyx-git/src/LyX.h:27:7: note: candidates are: class
> lyx::ErrorItem class ErrorItem;
> ^
This is completely unrelated to my patch.
Try if the attached patch helps.
Jürgen
diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index f44f7fc..538b487 100644
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -31,14 +31,14 @@ namespace lyx {
namespace {
-struct ErrorItem {
+struct DebugErrorItem {
Debug::Type level;
char const * name;
char const * desc;
};
-ErrorItem errorTags[] = {
+DebugErrorItem errorTags[] = {
{ Debug::NONE, "none", N_("No debugging messages")},
{ Debug::INFO, "info", N_("General information")},
{ Debug::INIT, "init", N_("Program initialisation")},
