Skip to content

Resolve warnings from Visual Studio Code analysis + Set C++20 standard and Level 3 warnings for MSVC2022 #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JeromeMartinez merged 3 commits into from
Feb 9, 2025
Merged

Resolve warnings from Visual Studio Code analysis + Set C++20 standard and Level 3 warnings for MSVC2022 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61b0574
Annotate fallthroughs
cjee21 Jan 30, 2025
b045c58
Resolve Visual Studio Code analysis warnings
cjee21 Jan 30, 2025
ce0edf0
Set C++20 standard and Level3 warnings
cjee21 Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion Project/MSVC2022/Library/ZenLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@
<PrecompiledHeaderFile>ZenLib/PreComp.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
Expand All @@ -170,6 +172,8 @@
<PrecompiledHeaderFile>ZenLib/PreComp.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
Expand All @@ -180,6 +184,8 @@
<PrecompiledHeaderFile>ZenLib/PreComp.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
Expand All @@ -190,6 +196,8 @@
<PrecompiledHeaderFile>ZenLib/PreComp.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -200,7 +208,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>ZenLib/PreComp.h</PrecompiledHeaderFile>
<Optimization>Disabled</Optimization>
<LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -213,6 +222,8 @@
<DebugInformationFormat>None</DebugInformationFormat>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
<ControlFlowGuard>Guard</ControlFlowGuard>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
Expand All @@ -224,6 +235,8 @@
<PrecompiledHeaderFile>ZenLib/PreComp.h</PrecompiledHeaderFile>
<DebugInformationFormat>None</DebugInformationFormat>
<ControlFlowGuard>Guard</ControlFlowGuard>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
Expand All @@ -237,6 +250,8 @@
<ControlFlowGuard>Guard</ControlFlowGuard>
<GuardEHContMetadata>true</GuardEHContMetadata>
<GuardSignedReturns>true</GuardSignedReturns>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
Expand All @@ -250,6 +265,8 @@
<ControlFlowGuard>Guard</ControlFlowGuard>
<GuardEHContMetadata>true</GuardEHContMetadata>
<GuardSignedReturns>true</GuardSignedReturns>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -262,6 +279,8 @@
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<ControlFlowGuard>Guard</ControlFlowGuard>
<GuardEHContMetadata>true</GuardEHContMetadata>
<LanguageStandard>stdcpp20</LanguageStandard>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
42 changes: 32 additions & 10 deletions Source/ZenLib/BitStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,32 @@ namespace ZenLib
class BitStream
{
public:
BitStream () {Buffer=NULL;
Buffer_Size=Buffer_Size_Init=Buffer_Size_BeforeLastCall=0;
LastByte_Size=0;
BufferUnderRun=true;
BookMark=false;}
BitStream (const int8u* Buffer_, size_t Size_) {Buffer=Buffer_;
Buffer_Size=Buffer_Size_Init=Buffer_Size_BeforeLastCall=Size_*8; //Size is in bits
LastByte_Size=0;
BufferUnderRun=Buffer_Size?false:true;
BookMark=false;}
BitStream () { Buffer = NULL;
Buffer_Size = 0;
Buffer_Size_Init = 0;
Buffer_Size_BeforeLastCall = 0;
LastByte = 0;
LastByte_Size = 0;
BufferUnderRun = true;
BookMark = false;
Buffer_BookMark = 0;
Buffer_Size_BookMark = 0;
LastByte_BookMark = 0;
LastByte_Size_BookMark = 0;
BufferUnderRun_BookMark = false; }
BitStream (const int8u* Buffer_, size_t Size_) { Buffer = Buffer_;
Buffer_Size = Size_ * 8; //Size is in bits
Buffer_Size_Init = Size_ * 8; //Size is in bits
Buffer_Size_BeforeLastCall = Size_ * 8; //Size is in bits
LastByte = 0;
LastByte_Size = 0;
BufferUnderRun = (Buffer_Size ? false : true);
BookMark = false;
Buffer_BookMark = 0;
Buffer_Size_BookMark = 0;
LastByte_BookMark = 0;
LastByte_Size_BookMark = 0;
BufferUnderRun_BookMark = false; }
virtual ~BitStream () {};

virtual void Attach(const int8u* Buffer_, size_t Size_)
Expand Down Expand Up @@ -98,14 +114,17 @@ class BitStream
ToReturn |= ((size_t)*Buffer) << NewBits;
Buffer++;
Buffer_Size-=8;
[[fallthrough]];
case 2 : NewBits-=8;
ToReturn |= ((size_t)*Buffer) << NewBits;
Buffer++;
Buffer_Size-=8;
[[fallthrough]];
case 1 : NewBits-=8;
ToReturn |= ((size_t)*Buffer) << NewBits;
Buffer++;
Buffer_Size-=8;
[[fallthrough]];
case 0 :
LastByte=*Buffer;
Buffer++;
Expand Down Expand Up @@ -191,12 +210,15 @@ class BitStream
case 3 : NewBits-=8;
Buffer++;
Buffer_Size-=8;
[[fallthrough]];
case 2 : NewBits-=8;
Buffer++;
Buffer_Size-=8;
[[fallthrough]];
case 1 : NewBits-=8;
Buffer++;
Buffer_Size-=8;
[[fallthrough]];
case 0 :
LastByte=*Buffer;
Buffer++;
Expand Down
22 changes: 14 additions & 8 deletions Source/ZenLib/BitStream_Fast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,16 @@ namespace ZenLib
class BitStream_Fast
{
public:
BitStream_Fast () {Buffer=NULL;
Buffer_Size=Buffer_Size_Init=0;
BufferUnderRun=false;}
BitStream_Fast (const int8u* Buffer_, size_t Size_) {Buffer=Buffer_;
Buffer_Size=Buffer_Size_Init=Size_*8; //Size is in bits
BufferUnderRun=false;}
BitStream_Fast () { Buffer = NULL;
Buffer_Size = 0;
Buffer_Size_Init = 0;
LastByte = 0;
BufferUnderRun = false; }
BitStream_Fast (const int8u* Buffer_, size_t Size_) { Buffer = Buffer_;
Buffer_Size = Size_ * 8; //Size is in bits
Buffer_Size_Init = Size_ * 8; //Size is in bits
LastByte = 0;
BufferUnderRun = false; }
~BitStream_Fast () {}

void Attach(const int8u* Buffer_, size_t Size_)
Expand Down Expand Up @@ -182,11 +186,12 @@ class BitStream_Fast
{
case 3 : NewBits-=8;
ToReturn|=*(Buffer++)<<NewBits;
[[fallthrough]];
case 2 : NewBits-=8;
ToReturn|=*(Buffer++)<<NewBits;
[[fallthrough]];
case 1 : NewBits-=8;
ToReturn|=*(Buffer++)<<NewBits;
default: ;
}
LastByte=*(Buffer++);
Buffer_Size-=HowMany;
Expand Down Expand Up @@ -358,13 +363,14 @@ class BitStream_Fast
case 3 : NewBits-=8;
ToReturn|=*Buffer<<NewBits;
Buffer++;
[[fallthrough]];
case 2 : NewBits-=8;
ToReturn|=*Buffer<<NewBits;
Buffer++;
[[fallthrough]];
case 1 : NewBits-=8;
ToReturn|=*Buffer<<NewBits;
Buffer++;
default: ;
}
ToReturn|=((*Buffer)>>((Buffer_Size-HowMany)%8))&Mask[NewBits];

Expand Down
17 changes: 9 additions & 8 deletions Source/ZenLib/BitStream_LE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@ namespace ZenLib
class BitStream_LE : public BitStream
{
public:
BitStream_LE () :BitStream()
{
endbyte=0;
endbit=0;
buffer=NULL;
ptr=NULL;
storage=0;
BitStream_LE() : BitStream(),
endbyte(0),
endbit(0),
buffer(NULL),
ptr(NULL),
ptr_BeforeLastCall(NULL),
storage(0) {
};

BitStream_LE (const int8u* Buffer_, size_t Size_) :BitStream(Buffer_, Size_) {
BitStream_LE (const int8u* Buffer_, size_t Size_) : BitStream(Buffer_, Size_),
ptr_BeforeLastCall(NULL) {
Attach(Buffer_, Size_);
};

Expand Down
6 changes: 3 additions & 3 deletions Source/ZenLib/Dir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,13 +530,13 @@ class GetAllFileNames_Private
Dir::dirlist_t Options;
HANDLE hFind;
#ifdef UNICODE
WIN32_FIND_DATAW FindFileDataW;
WIN32_FIND_DATAW FindFileDataW{};
#else
WIN32_FIND_DATA FindFileData;
WIN32_FIND_DATA FindFileData{};
#endif //UNICODE

GetAllFileNames_Private()
: hFind(INVALID_HANDLE_VALUE)
: Options(), hFind(INVALID_HANDLE_VALUE)
{
}
};
Expand Down
5 changes: 3 additions & 2 deletions Source/ZenLib/Format/Http/Http_Cookies.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ void Cookies::Create_Lines(std::ostream& Out)
struct tm *Gmt=gmtime(&Cookie->second.Expires);
#endif

if (strftime(Temp, 200, "%a, %d-%b-%Y %H:%M:%S GMT", Gmt))
Out << "; expires=" << Temp;
if (Gmt)
if (strftime(Temp, 200, "%a, %d-%b-%Y %H:%M:%S GMT", Gmt))
Out << "; expires=" << Temp;
}
if (!Cookie->second.Path.empty())
{
Expand Down
8 changes: 4 additions & 4 deletions Source/ZenLib/InfoMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ const Ztring InfoMap_EmptyZtring_Const; //Use it when we can't return a referenc
//---------------------------------------------------------------------------
// Constructors
InfoMap::InfoMap()
: std::multimap<ZenLib::Ztring, ZenLib::ZtringList> ()
: std::multimap<ZenLib::Ztring, ZenLib::ZtringList> (), Max()
{
Separator[0]=EOL;
Separator[1]=__T(";");
}

InfoMap::InfoMap(const Ztring &Source)
: std::multimap<ZenLib::Ztring, ZenLib::ZtringList> ()
: std::multimap<ZenLib::Ztring, ZenLib::ZtringList> (), Max()
{
Separator[0]=EOL;
Separator[1]=__T(";");
Write(Source);
}

InfoMap::InfoMap(const Char *Source)
: std::multimap<ZenLib::Ztring, ZenLib::ZtringList> ()
: std::multimap<ZenLib::Ztring, ZenLib::ZtringList> (), Max()
{
Separator[0]=EOL;
Separator[1]=__T(";");
Expand All @@ -62,7 +62,7 @@ InfoMap::InfoMap(const Char *Source)

#ifdef _UNICODE
InfoMap::InfoMap (const char* S)
: std::multimap<ZenLib::Ztring, ZenLib::ZtringList> ()
: std::multimap<ZenLib::Ztring, ZenLib::ZtringList> (), Max()
{
Separator[0]=EOL;
Separator[1]=__T(";");
Expand Down
1 change: 1 addition & 0 deletions Source/ZenLib/Thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ Thread::returnvalue Thread::ForceTerminate()
CriticalSectionLocker CSL(C);

//Terminating (not clean)
#pragma warning ( suppress : 6258 ) //C6258: Using TerminateThread does not allow proper thread clean up.
TerminateThread((HANDLE)ThreadPointer, 1);
ThreadPointer=NULL;

Expand Down
2 changes: 1 addition & 1 deletion Source/ZenLib/Translation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace ZenLib
//---------------------------------------------------------------------------
// Constructors
Translation::Translation()
: std::map<ZenLib::Ztring, ZenLib::Ztring> ()
: std::map<ZenLib::Ztring, ZenLib::Ztring> (), Max()
{
Separator[0]=EOL;
Separator[1]=__T(";");
Expand Down
Loading