Skip to content
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

Jump to bottom

Cleans up MSVC only warnings pragmas. #1013

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Cleans up MSVC only warnings pragmas. #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d2f9ca
Cleans up MSVC only warnings pragmas.
OmniBlade Jun 21, 2024
770aad3
Merge branch 'vanilla' into cleanup/pragma-warn
giulianobelinassi Jun 25, 2024
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
2 changes: 1 addition & 1 deletion CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"hidden": true,
"cacheVariables": {
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
"VC_CXX_FLAGS": "/Zc:strictStrings;-wd4244;-wd4018;-wd4291;-wd4101;-wd4267",
"VC_CXX_FLAGS": "/Zc:strictStrings;-wd4244;-wd4018;-wd4291;-wd4101;-wd4267;-wd4200",
"CMAKE_CXX_FLAGS_RELEASE": "/Zi /O2 /Ob2 /DNDEBUG",
"CMAKE_EXE_LINKER_FLAGS_RELEASE": "/debug:full /INCREMENTAL:NO",
"CMAKE_MODULE_LINKER_FLAGS_RELEASE": "/debug:full /INCREMENTAL:NO",
Expand Down
3 changes: 0 additions & 3 deletions common/field.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
#include "field.h"
#include "endianness.h"

// ST - 12/18/2018 10:14AM
#pragma warning(disable : 4996)

FieldClass::FieldClass(const char* id, char data)
{
strncpy(ID, id, sizeof(ID));
Expand Down
2 changes: 0 additions & 2 deletions common/graphicsviewport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,8 +779,6 @@ unsigned int GraphicViewPortClass::Print(char const* str, int x, int y, int fcol
return (return_code);
}

#pragma warning(disable : 4996)

/***************************************************************************
* GVPC::PRINT -- Stub function to print an integer *
* *
Expand Down
3 changes: 0 additions & 3 deletions common/ini.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@
#include "cstraw.h"
#endif

// Disable the "temporary object used to initialize a non-constant reference" warning.
//#pragma warning 665 9

/***********************************************************************************************
* INIClass::~INIClass -- Destructor for INI handler. *
* *
Expand Down
2 changes: 0 additions & 2 deletions common/int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,6 @@ template <class T> T Gcd(const T& a, const T& n)
return g[(i - 1) % 3];
}

//#pragma warning 604 9
//#pragma warning 595 9
template <class T> T Generate_Prime(Straw& rng, int pbits)
{
T minQ = (T(1UL) << (unsigned short)(pbits - (unsigned short)2));
Expand Down
1 change: 0 additions & 1 deletion common/mp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ unsigned XMP_Encode(unsigned char* to, unsigned tobytes, digit const* from, int
* HISTORY: *
* 07/01/1996 JLB : Created. *
*=============================================================================================*/
//#pragma warning 364 9
unsigned XMP_Encode(unsigned char* to, digit const* from, int precision)
{
int i;
Expand Down
1 change: 0 additions & 1 deletion common/packet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@ bool PacketClass::Get_Field(const char* id, int& data)
* HISTORY: *
* 04/23/1996 PWG : Created. *
*========================================================================*/
#pragma warning(disable : 4996)
bool PacketClass::Get_Field(const char* id, char* data)
{
FieldClass* field = Find_Field(id);
Expand Down
1 change: 0 additions & 1 deletion common/shape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ typedef struct
/*
------------------------------- Shape block ---------------------------------
*/
#pragma warning(disable : 4200)
#pragma pack(push, 2)
typedef struct
{
Expand Down
1 change: 1 addition & 0 deletions common/soscodec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ unsigned sosCODECDecompressData(_SOS_COMPRESS_INFO* stream, unsigned bytes)
}
#endif
assert(0 && "Unreachable");
return 0;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is unreachable then why are you returning 0 here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its in theory reachable while the else branch is ifdef out when compiling with NDEBUG which triggers compiler warnings. Other option is to remove the ifdef and let the else branch ride?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I would expect the compiler to not complain once assert(0 && string) = assert(0) and hence anything beyond that would fall into dead code.

But perhaps the compiler has bugs...

}

//
Expand Down
6 changes: 0 additions & 6 deletions redalert/dllinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
**
*/

// Exception handling isn't enabled
#pragma warning(disable : 4530) // warning C4530: C++ exception handler used, but unwind semantics are not enabled.

#include <string>
#include <vector>
#include <set>
Expand Down Expand Up @@ -72,9 +69,6 @@ typedef __int64 int64;
**
**
*/
// For compatibility with Watcom in audio enums
#pragma warning(disable : 4091)

// From RedAlert\Audio.cpp
typedef enum
{
Expand Down
3 changes: 0 additions & 3 deletions redalert/ipxmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@

#endif // WINSOCK_IPX

// Turn off "expression is not meaningful".
//#pragma warning 628 9

//#include "WolDebug.h"

/***************************************************************************
Expand Down
1 change: 0 additions & 1 deletion tiberiandawn/conquer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3613,7 +3613,6 @@ static bool Change_Local_Dir(int cd)
* 07/11/1995 JLB : Created. *
* 05/22/1996 ST : Handles multiple CD drives / CD changers *
*=============================================================================================*/
#pragma warning(disable : 4101)
bool Force_CD_Available(int cd)
{

Expand Down
9 changes: 0 additions & 9 deletions tiberiandawn/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,6 @@

#define FOREIGN_VERSION_NUMBER 6

//
// typedef enums with -1 will show this warning, even when the type of the enum is signed. It's a compiler bug,
// apparently ST - 1/8/2019 9:23AM
//
#pragma warning(push)
#pragma warning(disable : 4341)

/**********************************************************************
** These enumerations are used to implement RTTI.
*/
Expand Down Expand Up @@ -3042,6 +3035,4 @@ typedef enum StrategyType : unsigned char

#endif // USE_RA_AI

#pragma warning(pop)

#endif
3 changes: 0 additions & 3 deletions tiberiandawn/dllinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ typedef __int64 int64;
**
**
*/
// For compatibility with Watcom in audio enums
#pragma warning(disable : 4091)

// From TiberianDawn\Audio.cpp
typedef enum
{
Expand Down
2 changes: 0 additions & 2 deletions tiberiandawn/iomap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@

#include "function.h"

#pragma warning(disable : 4302) // Truncation from pointer to TARGET

/***********************************************************************************************
* CellClass::Should_Save -- Should the cell be written to disk? *
* *
Expand Down
2 changes: 0 additions & 2 deletions tiberiandawn/ioobj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@

#include "function.h"

#pragma warning(disable : 4302) // Truncation from pointer to TARGET

/***********************************************************************************************
* TeamTypeClass::Load -- Loads from a save game file. *
* *
Expand Down
3 changes: 0 additions & 3 deletions tiberiandawn/ipxmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@
/* For `Players` vector */
#include "externs.h"

// Turn off "expression is not meaningful".
//#pragma warning 628 9

//#include "WolDebug.h"

/***************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion tools/miniposix/dirent/dirent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ DIR *opendir(const char *name)
__seterrno(ENOENT);
return NULL;
}
size = wcslen(full) + 1;
size = (int)wcslen(full) + 1;
memcpy(wname, L"\\\\?\\", sizeof(wchar_t) * 5);
if (size > NTFS_MAX_PATH) {
free(wname);
Expand Down