aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken build on MSVC.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-05 16:44:20 +03:00
parent 2af9c0e65a
commit e7b72c4a44
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/vlayout/vbank.cpp
View File

@ -50,6 +50,14 @@ Q_LOGGING_CATEGORY(lBank, "layout.bank")
#pragma warning( pop ) #pragma warning( pop )
#endif #endif
// An annoying char define, from the Windows team in <rpcndr.h>
// #define small char
// http://stuartjames.info/Journal/c--visual-studio-2012-vs2012--win8--converting-projects-up-some-conflicts-i-found.aspx
#if defined (Q_OS_WIN) && defined (Q_CC_MSVC)
#pragma push_macro("small")
#undef small
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VBank::VBank() VBank::VBank()
:details(QVector<VLayoutDetail>()), unsorted(QHash<int, qint64>()), big(QHash<int, qint64>()), :details(QVector<VLayoutDetail>()), unsorted(QHash<int, qint64>()), big(QHash<int, qint64>()),
@ -423,3 +431,7 @@ void VBank::SqMaxMin(qint64 &sMax, qint64 &sMin) const
} }
} }
#if defined (Q_OS_WIN) && defined (Q_CC_MSVC)
#pragma pop_macro("small")
#endif