From 06e3e78a729d8c16acf282629da2c1bca9827d7e Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Tue, 10 May 2022 18:15:55 -0400 Subject: [PATCH] correct namespacing to work with really old GCC; --- lookups/LookupTable.h | 3 ++- p25/Control.h | 4 ++-- p25/packet/Trunk.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lookups/LookupTable.h b/lookups/LookupTable.h index 3ed598ae..e28c850d 100644 --- a/lookups/LookupTable.h +++ b/lookups/LookupTable.h @@ -60,7 +60,8 @@ namespace lookups LookupTable(const std::string& filename, uint32_t reloadTime) : Thread(), m_filename(filename), - m_reloadTime(reloadTime) + m_reloadTime(reloadTime), + m_table() { /* stub */ } diff --git a/p25/Control.h b/p25/Control.h index e695da2b..2361af80 100644 --- a/p25/Control.h +++ b/p25/Control.h @@ -57,10 +57,10 @@ namespace p25 // --------------------------------------------------------------------------- namespace packet { class HOST_SW_API Voice; } - namespace dfsi::packet { class HOST_SW_API DFSIVoice; } + namespace dfsi { namespace packet { class HOST_SW_API DFSIVoice; } } namespace packet { class HOST_SW_API Data; } namespace packet { class HOST_SW_API Trunk; } - namespace dfsi::packet { class HOST_SW_API DFSITrunk; } + namespace dfsi { namespace packet { class HOST_SW_API DFSITrunk; } } // --------------------------------------------------------------------------- // Class Declaration diff --git a/p25/packet/Trunk.h b/p25/packet/Trunk.h index 467df014..d699c654 100644 --- a/p25/packet/Trunk.h +++ b/p25/packet/Trunk.h @@ -48,7 +48,7 @@ namespace p25 // --------------------------------------------------------------------------- namespace packet { class HOST_SW_API Voice; } - namespace dfsi::packet { class HOST_SW_API DFSIVoice; } + namespace dfsi { namespace packet { class HOST_SW_API DFSIVoice; } } namespace packet { class HOST_SW_API Data; } class HOST_SW_API Control;