feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix MSVC2015 build

Browse Source 
- error C3431: 'LanguageExtension': a scoped enumeration cannot be
redeclared as an unscoped enumeration

 - add constructors to SlotUsage

 - do not use pointers for back_insert_iterator.

Change-Id: Id6df08436de639b70fdf6ccc4914f8dee2cb8628
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-01-22 09:34:14 +01:00
committed by Marco Bubke
parent 537a4ba285
commit 7f9931b3f9
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/cpplanguage_details.h
View File

@@ -60,14 +60,13 @@ enum class LanguageExtension : unsigned char {
Q_DECLARE_FLAGS(LanguageExtensions, LanguageExtension)
constexpr enum LanguageExtension operator|(const LanguageExtension first,
const LanguageExtension second)
constexpr LanguageExtension operator|(LanguageExtension first, LanguageExtension second)
{
return static_cast<LanguageExtension>(
(static_cast<unsigned char>(first) | static_cast<unsigned char>(second)));
}
constexpr bool operator&&(const LanguageExtension first, const LanguageExtension second)
constexpr bool operator&&(LanguageExtension first, LanguageExtension second)
{
return static_cast<unsigned char>(first) & static_cast<unsigned char>(second);
}