Skip to content

Commit 51823ca

Browse files
committed
misc: fix windows build
1 parent d40401a commit 51823ca

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

include/DMDUtil/DMD.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ class DMDUTILAPI DMD
123123
uint16_t width;
124124
uint16_t height;
125125

126-
void convertToHostByteOrder();
127-
Update toNetworkByteOrder() const;
126+
DMDUTILAPI void convertToHostByteOrder();
127+
DMDUTILAPI Update toNetworkByteOrder() const;
128128
};
129129

130130
struct StreamHeader
@@ -138,8 +138,8 @@ class DMDUTILAPI DMD
138138
uint8_t disconnectOthers = 0; // 0 => no, 1 => yes
139139
uint32_t length = 0;
140140

141-
void convertToHostByteOrder();
142-
void convertToNetworkByteOrder();
141+
DMDUTILAPI void convertToHostByteOrder();
142+
DMDUTILAPI void convertToNetworkByteOrder();
143143
};
144144

145145
struct PathsHeader

src/DMD.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,8 @@ void DMD::DmdFrameThread()
684684
{
685685
char name[DMDUTIL_MAX_NAME_SIZE] = {0};
686686

687-
m_dmdFrameReady.load(std::memory_order_acquire);
688-
m_stopFlag.load(std::memory_order_acquire);
687+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
688+
(void)m_stopFlag.load(std::memory_order_acquire);
689689

690690
while (true)
691691
{
@@ -728,8 +728,8 @@ void DMD::ZeDMDThread()
728728
uint8_t indexBuffer[256 * 64] = {0};
729729
uint8_t renderBuffer[256 * 64 * 3] = {0};
730730

731-
m_dmdFrameReady.load(std::memory_order_acquire);
732-
m_stopFlag.load(std::memory_order_acquire);
731+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
732+
(void)m_stopFlag.load(std::memory_order_acquire);
733733

734734
Config* const pConfig = Config::GetInstance();
735735
bool showNotColorizedFrames = pConfig->IsShowNotColorizedFrames();
@@ -863,8 +863,8 @@ void DMD::SerumThread()
863863
uint32_t nextRotation = 0;
864864
Update* lastDmdUpdate = nullptr;
865865

866-
m_dmdFrameReady.load(std::memory_order_acquire);
867-
m_stopFlag.load(std::memory_order_acquire);
866+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
867+
(void)m_stopFlag.load(std::memory_order_acquire);
868868

869869
Config* const pConfig = Config::GetInstance();
870870
bool showNotColorizedFrames = pConfig->IsShowNotColorizedFrames();
@@ -1086,8 +1086,8 @@ void DMD::PixelcadeDMDThread()
10861086
uint8_t palette[PALETTE_SIZE] = {0};
10871087
uint16_t rgb565Data[128 * 32] = {0};
10881088

1089-
m_dmdFrameReady.load(std::memory_order_acquire);
1090-
m_stopFlag.load(std::memory_order_acquire);
1089+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
1090+
(void)m_stopFlag.load(std::memory_order_acquire);
10911091

10921092
Config* const pConfig = Config::GetInstance();
10931093
bool showNotColorizedFrames = pConfig->IsShowNotColorizedFrames();
@@ -1258,8 +1258,8 @@ void DMD::LevelDMDThread()
12581258
uint8_t bufferPosition = 0;
12591259
uint8_t renderBuffer[256 * 64] = {0};
12601260

1261-
m_dmdFrameReady.load(std::memory_order_acquire);
1262-
m_stopFlag.load(std::memory_order_acquire);
1261+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
1262+
(void)m_stopFlag.load(std::memory_order_acquire);
12631263

12641264
while (true)
12651265
{
@@ -1305,8 +1305,8 @@ void DMD::RGB24DMDThread()
13051305
uint8_t renderBuffer[256 * 64] = {0};
13061306
uint8_t rgb24Data[256 * 64 * 3] = {0};
13071307

1308-
m_dmdFrameReady.load(std::memory_order_acquire);
1309-
m_stopFlag.load(std::memory_order_acquire);
1308+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
1309+
(void)m_stopFlag.load(std::memory_order_acquire);
13101310

13111311
Config* const pConfig = Config::GetInstance();
13121312
bool showNotColorizedFrames = pConfig->IsShowNotColorizedFrames();
@@ -1453,8 +1453,8 @@ void DMD::ConsoleDMDThread()
14531453
uint8_t bufferPosition = 0;
14541454
uint8_t renderBuffer[256 * 64] = {0};
14551455

1456-
m_dmdFrameReady.load(std::memory_order_acquire);
1457-
m_stopFlag.load(std::memory_order_acquire);
1456+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
1457+
(void)m_stopFlag.load(std::memory_order_acquire);
14581458

14591459
while (true)
14601460
{
@@ -1566,8 +1566,8 @@ void DMD::DumpDMDTxtThread()
15661566
FILE* f = nullptr;
15671567
std::unordered_set<uint64_t> seenHashes;
15681568

1569-
m_dmdFrameReady.load(std::memory_order_acquire);
1570-
m_stopFlag.load(std::memory_order_acquire);
1569+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
1570+
(void)m_stopFlag.load(std::memory_order_acquire);
15711571

15721572
Config* const pConfig = Config::GetInstance();
15731573
bool dumpNotColorizedFrames = pConfig->IsDumpNotColorizedFrames();
@@ -1718,8 +1718,8 @@ void DMD::DumpDMDRawThread()
17181718
std::chrono::steady_clock::time_point start;
17191719
FILE* f = nullptr;
17201720

1721-
m_dmdFrameReady.load(std::memory_order_acquire);
1722-
m_stopFlag.load(std::memory_order_acquire);
1721+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
1722+
(void)m_stopFlag.load(std::memory_order_acquire);
17231723

17241724
while (true)
17251725
{
@@ -1792,8 +1792,8 @@ void DMD::PupDMDThread()
17921792
uint8_t palette[192] = {0};
17931793
char name[DMDUTIL_MAX_NAME_SIZE] = {0};
17941794

1795-
m_dmdFrameReady.load(std::memory_order_acquire);
1796-
m_stopFlag.load(std::memory_order_acquire);
1795+
(void)m_dmdFrameReady.load(std::memory_order_acquire);
1796+
(void)m_stopFlag.load(std::memory_order_acquire);
17971797

17981798
while (true)
17991799
{

0 commit comments

Comments
 (0)