Skip to content

Commit 088337a

Browse files
committed
build: Fix build on Windows
1 parent 97311ad commit 088337a

File tree

6 files changed

+14
-2
lines changed

6 files changed

+14
-2
lines changed

src/misc/datacache.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@ namespace swift::misc
351351
: m_basename(basename), m_session(std::make_unique<Session>(m_basename + "/.session"))
352352
{}
353353

354+
CDataCacheRevision::~CDataCacheRevision() = default; // Explicitly in cpp file
355+
354356
CDataCacheRevision::LockGuard CDataCacheRevision::beginUpdate(const QMap<QString, qint64> &timestamps,
355357
bool updateUuid, bool pinsOnly)
356358
{

src/misc/datacache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ namespace swift::misc
8383
CDataCacheRevision(const QString &basename);
8484

8585
//! Destructor.
86-
~CDataCacheRevision() = default;
86+
~CDataCacheRevision();
8787

8888
//! @{
8989
//! Non-copyable.

src/misc/simulation/settings/xswiftbussettingsqtfree.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#ifndef SWIFT_MISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
55
#define SWIFT_MISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
66

7+
#include <algorithm>
78
#include <chrono>
89
#include <string>
910

src/plugins/simulator/flightgear/flightgearmpaircraft.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace swift::simplugin::flightgear
2323
{
2424
public:
2525
//! Constructor
26-
CFlightgearMPAircraft();
26+
CFlightgearMPAircraft() = default;
2727

2828
//! Constructor providing initial situation/parts
2929
CFlightgearMPAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft,

src/xswiftbus/dbusconnection.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
#ifndef SWIFT_SIM_XSWIFTBUS_DBUSCONNECTION_H
55
#define SWIFT_SIM_XSWIFTBUS_DBUSCONNECTION_H
66

7+
#ifndef NOMINMAX
8+
// windows.h min/max might be imported via dbus.h
9+
# define NOMINMAX
10+
#endif
11+
712
#include <dbus/dbus.h>
813
#include <event2/event.h>
914

src/xswiftbus/dbusserver.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#ifndef SWIFT_SIM_XSWIFTBUS_DBUSSERVER_H
55
#define SWIFT_SIM_XSWIFTBUS_DBUSSERVER_H
66

7+
#ifndef NOMINMAX
8+
# define NOMINMAX
9+
#endif
10+
711
#include <dbus/dbus.h>
812
#include <event2/event.h>
913

0 commit comments

Comments
 (0)