mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 06:45:37 +08:00
build: Fix build on Windows
This commit is contained in:
@@ -351,6 +351,8 @@ namespace swift::misc
|
|||||||
: m_basename(basename), m_session(std::make_unique<Session>(m_basename + "/.session"))
|
: m_basename(basename), m_session(std::make_unique<Session>(m_basename + "/.session"))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
CDataCacheRevision::~CDataCacheRevision() = default; // Explicitly in cpp file
|
||||||
|
|
||||||
CDataCacheRevision::LockGuard CDataCacheRevision::beginUpdate(const QMap<QString, qint64> ×tamps,
|
CDataCacheRevision::LockGuard CDataCacheRevision::beginUpdate(const QMap<QString, qint64> ×tamps,
|
||||||
bool updateUuid, bool pinsOnly)
|
bool updateUuid, bool pinsOnly)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ namespace swift::misc
|
|||||||
CDataCacheRevision(const QString &basename);
|
CDataCacheRevision(const QString &basename);
|
||||||
|
|
||||||
//! Destructor.
|
//! Destructor.
|
||||||
~CDataCacheRevision() = default;
|
~CDataCacheRevision();
|
||||||
|
|
||||||
//! @{
|
//! @{
|
||||||
//! Non-copyable.
|
//! Non-copyable.
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
#ifndef SWIFT_MISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
|
#ifndef SWIFT_MISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
|
||||||
#define SWIFT_MISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
|
#define SWIFT_MISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ namespace swift::simplugin::flightgear
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
//! Constructor
|
//! Constructor
|
||||||
CFlightgearMPAircraft();
|
CFlightgearMPAircraft() = default;
|
||||||
|
|
||||||
//! Constructor providing initial situation/parts
|
//! Constructor providing initial situation/parts
|
||||||
CFlightgearMPAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft,
|
CFlightgearMPAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft,
|
||||||
|
|||||||
@@ -4,6 +4,11 @@
|
|||||||
#ifndef SWIFT_SIM_XSWIFTBUS_DBUSCONNECTION_H
|
#ifndef SWIFT_SIM_XSWIFTBUS_DBUSCONNECTION_H
|
||||||
#define SWIFT_SIM_XSWIFTBUS_DBUSCONNECTION_H
|
#define SWIFT_SIM_XSWIFTBUS_DBUSCONNECTION_H
|
||||||
|
|
||||||
|
#ifndef NOMINMAX
|
||||||
|
// windows.h min/max might be imported via dbus.h
|
||||||
|
# define NOMINMAX
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <dbus/dbus.h>
|
#include <dbus/dbus.h>
|
||||||
#include <event2/event.h>
|
#include <event2/event.h>
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@
|
|||||||
#ifndef SWIFT_SIM_XSWIFTBUS_DBUSSERVER_H
|
#ifndef SWIFT_SIM_XSWIFTBUS_DBUSSERVER_H
|
||||||
#define SWIFT_SIM_XSWIFTBUS_DBUSSERVER_H
|
#define SWIFT_SIM_XSWIFTBUS_DBUSSERVER_H
|
||||||
|
|
||||||
|
#ifndef NOMINMAX
|
||||||
|
# define NOMINMAX
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <dbus/dbus.h>
|
#include <dbus/dbus.h>
|
||||||
#include <event2/event.h>
|
#include <event2/event.h>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user