From b90855d39308f85b883e9b2589ac096b6b27d0f6 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Fri, 4 Oct 2019 18:37:24 +0100 Subject: [PATCH] [AFV] Fixed GCC and Clang errors --- src/blackcore/afv/crypto/cryptodtoserializer.h | 4 ++++ src/blackgui/models/atcstationtreemodel.cpp | 1 - src/blacksound/sampleprovider/pinknoisegenerator.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/blackcore/afv/crypto/cryptodtoserializer.h b/src/blackcore/afv/crypto/cryptodtoserializer.h index eef37e55a..cd2f821e7 100644 --- a/src/blackcore/afv/crypto/cryptodtoserializer.h +++ b/src/blackcore/afv/crypto/cryptodtoserializer.h @@ -20,6 +20,10 @@ #include #include +#ifndef crypto_aead_chacha20poly1305_IETF_ABYTES +#define crypto_aead_chacha20poly1305_IETF_ABYTES 16U +#endif + namespace BlackCore { namespace Afv diff --git a/src/blackgui/models/atcstationtreemodel.cpp b/src/blackgui/models/atcstationtreemodel.cpp index c7531a498..fe0d24c10 100644 --- a/src/blackgui/models/atcstationtreemodel.cpp +++ b/src/blackgui/models/atcstationtreemodel.cpp @@ -32,7 +32,6 @@ using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; -using namespace BlackMisc::Audio; using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; diff --git a/src/blacksound/sampleprovider/pinknoisegenerator.h b/src/blacksound/sampleprovider/pinknoisegenerator.h index 7a8b4fa28..214fbeefd 100644 --- a/src/blacksound/sampleprovider/pinknoisegenerator.h +++ b/src/blacksound/sampleprovider/pinknoisegenerator.h @@ -40,7 +40,7 @@ namespace BlackSound private: QRandomGenerator random; - std::array pinkNoiseBuffer = {0}; + std::array pinkNoiseBuffer = {{0}}; double m_gain = 0.0; }; }