anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace #warning by something that is understood by MSVC

Browse Source 
MSVC gives a warning when using #warning. However, it does
not show the actual warning.
This commit is contained in:
Vincent van Ravesteijn 2012-03-16 12:22:34 +01:00
parent 234ba2c419
commit ea506d6a67
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiApplication.cpp
View File

@ -2292,7 +2292,11 @@ void GuiApplication::commitData(QSessionManager & sm)
/// We are changing that to close all wiew one by one. /// We are changing that to close all wiew one by one.
/// FIXME: verify if the default implementation is enough now. /// FIXME: verify if the default implementation is enough now.
#ifdef QT_NO_SESSIONMANAGER #ifdef QT_NO_SESSIONMANAGER
#ifndef _MSC_VER
#warning Qt is compiled without session manager #warning Qt is compiled without session manager
#else
#pragma message("warning: Qt is compiled without session manager")
#endif
(void) sm; (void) sm;
#else #else
if (sm.allowsInteraction() && !closeAllViews()) if (sm.allowsInteraction() && !closeAllViews())

6
src/version.h
View File

@ -34,9 +34,15 @@ extern char const * const lyx_version_info;
#define LYX_FORMAT_TEX2LYX 428 // uwestoehr: rotated table cells #define LYX_FORMAT_TEX2LYX 428 // uwestoehr: rotated table cells
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER
#warning "tex2lyx produces an out of date file format." #warning "tex2lyx produces an out of date file format."
#warning "Please update tex2lyx as soon as possible, since it depends implicitly" #warning "Please update tex2lyx as soon as possible, since it depends implicitly"
#warning "on the current file format in some places (this causes bugs like #7780)." #warning "on the current file format in some places (this causes bugs like #7780)."
#else
#pragma message("warning: tex2lyx produces an out of date file format. " \
"Please update tex2lyx as soon as possible, since it depends implicitly " \
"on the current file format in some places (this causes bugs like #7780).")
#endif
#endif #endif
//} // namespace lyx //} // namespace lyx