From f51d7fdd2a0e6be47da166bb566337e3ff60c8fc Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 16 Jul 2015 09:45:45 +0200 Subject: [PATCH] Compilation fix for windows Since commit 7ac70092, lyx::dispatch returns a DispatchResult const &, which is ignored in the cases below. Nevertheless, the windows compiler complains that it does not know this type. Gcc and clang can deal with it without problem. --- src/frontends/qt4/Action.cpp | 4 ++++ src/frontends/qt4/InsertTableWidget.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp index 115111f27f..71e41a4431 100644 --- a/src/frontends/qt4/Action.cpp +++ b/src/frontends/qt4/Action.cpp @@ -12,9 +12,13 @@ #include "Action.h" +// DispatchResult.h is needed by the windows compiler because lyx::dispatch +// returns a DispatchResult const reference. Gcc does not complain. Weird... +#include "DispatchResult.h" #include "FuncRequest.h" #include "FuncStatus.h" #include "LyX.h" + #include "qt_helpers.h" #include "support/debug.h" diff --git a/src/frontends/qt4/InsertTableWidget.cpp b/src/frontends/qt4/InsertTableWidget.cpp index 889e056abc..813ccdb17a 100644 --- a/src/frontends/qt4/InsertTableWidget.cpp +++ b/src/frontends/qt4/InsertTableWidget.cpp @@ -16,6 +16,9 @@ #include "GuiView.h" #include "qt_helpers.h" +// DispatchResult.h is needed by the windows compiler because lyx::dispatch +// returns a DispatchResult const reference. Gcc does not complain. Weird... +#include "DispatchResult.h" #include "FuncStatus.h" #include "FuncRequest.h" #include "LyX.h" -- 2.39.2