Skip to content

Commit 73e432a

Browse files
committed
Fix Windows C++17 build and MSVC flag warnings
1 parent 2c28542 commit 73e432a

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ set (CMAKE_CXX_STANDARD 17)
44
set (CMAKE_C_STANDARD 11)
55

66
#add_definitions( "-Wall -O2 -g -Rpass-analysis=loop-vectorize" )
7-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer")
7+
if (NOT MSVC)
8+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer")
9+
endif()
810

911
if(NOT CMAKE_BUILD_TYPE)
1012
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)

src/atrac/at1/atrac1_bitalloc.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,14 +330,14 @@ uint32_t TAt1BitAlloc::Write(const std::vector<TScaledBlock>& scaledBlocks, cons
330330
{
331331
uint32_t bfuIdx = BfuIdxConst ? BfuIdxConst - 1 : 7;
332332
vector<uint8_t> bitsPerEachBlock(TAtrac1Data::BfuAmountTab[bfuIdx]);
333-
TEncodeCtx ctx {
334-
.Booster = this,
335-
.ScaledBlocks = scaledBlocks,
336-
.BlockSize = blockSize,
337-
.Loudness = loudness,
338-
.BfuIdx = bfuIdx,
339-
.Spread = AnalizeScaleFactorSpread(scaledBlocks),
340-
.BitsPerBlock = bitsPerEachBlock,
333+
TEncodeCtx ctx{
334+
this,
335+
scaledBlocks,
336+
blockSize,
337+
loudness,
338+
bfuIdx,
339+
AnalizeScaleFactorSpread(scaledBlocks),
340+
bitsPerEachBlock,
341341
};
342342

343343
NBitStream::TBitStream bitStream;

0 commit comments

Comments
 (0)