flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed BLACK_FALLTHROUGH to Q_FALLTHROUGH().

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-01-03 23:24:44 +00:00
parent 0c5442d59c
commit 1f83d677f3
7 changed files with 9 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/aviation/aircraftsituation.cpp
View File

@@ -7,7 +7,6 @@
* contained in the LICENSE file.
*/
#include "blackmisc/fallthrough.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircraftsituationchange.h"
@@ -416,9 +415,8 @@ namespace BlackMisc
{
const int c = Compare::compare(this->getGroundElevationInfo(), compareValue.getGroundElevationInfo());
if (c != 0) { return c; }
// fall through, compare flag
BLACK_FALLTHROUGH;
}
Q_FALLTHROUGH();
case IndexGroundElevationInfoTransferred: return Compare::compare(m_isElvInfoTransferred, compareValue.m_isElvInfoTransferred);
case IndexCanLikelySkipNearGroundInterpolation: return Compare::compare(this->canLikelySkipNearGroundInterpolation(), compareValue.canLikelySkipNearGroundInterpolation());
default: break;

33
src/blackmisc/fallthrough.h
View File

@@ -1,33 +0,0 @@
/* Copyright (C) 2018
* swift project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
//! \file
#ifndef BLACKMISC_FALLTHROUGH_H
#define BLACKMISC_FALLTHROUGH_H
#include <QtGlobal>
//! \cond
// MSVC2017: [[fallthrough]] supported but only enabled with /std:c++17
// GCC7+: [[gnu::fallthrough]] for C++11/14, [[fallthrough]] for C++17
// XCode: Does not seem to work in current configuration
#if defined(Q_CC_GNU) && Q_CC_GNU > 700
#if __has_cpp_attribute(fallthrough)
#define BLACK_FALLTHROUGH [[gnu::fallthrough]]
#endif
#else
#define BLACK_FALLTHROUGH
#endif
//! \endcond
#endif

8
src/blackmisc/logpattern.cpp
View File

@@ -7,7 +7,6 @@
* contained in the LICENSE file.
*/
#include "blackmisc/fallthrough.h"
#include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h"
#include "blackmisc/logpattern.h"
@@ -153,14 +152,13 @@ namespace BlackMisc
result.m_severities.clear();
switch (minimumSeverity)
{
// there are deliberately no break statements in this switch block
default:
case CStatusMessage::SeverityDebug: result.m_severities.insert(CStatusMessage::SeverityDebug);
BLACK_FALLTHROUGH;
Q_FALLTHROUGH();
case CStatusMessage::SeverityInfo: result.m_severities.insert(CStatusMessage::SeverityInfo);
BLACK_FALLTHROUGH;
Q_FALLTHROUGH();
case CStatusMessage::SeverityWarning: result.m_severities.insert(CStatusMessage::SeverityWarning);
BLACK_FALLTHROUGH;
Q_FALLTHROUGH();
case CStatusMessage::SeverityError: result.m_severities.insert(CStatusMessage::SeverityError);
}
return result;