OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Merge pull request #397 from zrax/warnings

Browse Source 
Clean up some warnings, and make the CRT ones more relevant
This commit is contained in:
Adam Johnson
2014-04-07 22:28:50 -04:00
parent 50d16c3d1f a58e9c643c
commit 9b46e8e739
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -114,8 +114,8 @@ else()
endif() endif()
if(MSVC) if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_SCL_SECURE_NO_DEPRECATE)
endif(MSVC) endif(MSVC)
#TODO: Make the OpenSSL includes less promiscuous so this isn't needed #TODO: Make the OpenSSL includes less promiscuous so this isn't needed

4
Sources/Plasma/CoreLib/plFileSystem.h
View File

@ -259,10 +259,10 @@ public:
uint64_t ModifyTime() const { return fModifyTime; } uint64_t ModifyTime() const { return fModifyTime; }
/** Returns \p true if this file is a directory. */ /** Returns \p true if this file is a directory. */
bool IsDirectory() const { return (fFlags & kIsDirectory); } bool IsDirectory() const { return (fFlags & kIsDirectory) != 0; }
/** Returns \p true if this file is a regular file. */ /** Returns \p true if this file is a regular file. */
bool IsFile() const { return (fFlags & kIsNormalFile); } bool IsFile() const { return (fFlags & kIsNormalFile) != 0; }
private: private:
plFileName fName; plFileName fName;

2
Sources/Plasma/CoreLib/plString.h
View File

@ -66,6 +66,8 @@ typedef unsigned int UniChar;
# define wcsicmp _wcsicmp # define wcsicmp _wcsicmp
# define wcsnicmp _wcsnicmp # define wcsnicmp _wcsnicmp
# define strlwr _strlwr # define strlwr _strlwr
# define strdup _strdup
# define wcsdup _wcsdup
#else #else
# define stricmp strcasecmp # define stricmp strcasecmp
# define strnicmp strncasecmp # define strnicmp strncasecmp

5
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Dns.cpp
View File

@ -273,11 +273,12 @@ void AsyncAddressLookupName (
// Get name/port // Get name/port
char* ansiName = strdup(name); char* ansiName = strdup(name);
if (char* portStr = StrChr(ansiName, ':')) { if (char* portStr = strchr(ansiName, ':')) {
if (unsigned newPort = StrToUnsigned(portStr + 1, nil, 10)) if (unsigned long newPort = strtoul(portStr + 1, nullptr, 10))
port = newPort; port = newPort;
*portStr = 0; *portStr = 0;
} }
free(ansiName);
// Initialize lookup // Initialize lookup
Lookup * lookup = new Lookup; Lookup * lookup = new Lookup;

2
Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp
View File

@ -313,8 +313,6 @@ void hsG3DDeviceSelector::RemoveUnusableDevModes(bool bTough)
} }
else if (fRecords[i].GetG3DDeviceType() == hsG3DDeviceSelector::kDevTypeDirect3D) else if (fRecords[i].GetG3DDeviceType() == hsG3DDeviceSelector::kDevTypeDirect3D)
{ {
uint32_t totalMem;
// Remove software Direct3D devices // Remove software Direct3D devices
if ((fRecords[i].GetG3DHALorHEL() != hsG3DDeviceSelector::kHHD3DHALDev) && if ((fRecords[i].GetG3DHALorHEL() != hsG3DDeviceSelector::kHHD3DHALDev) &&
(fRecords[i].GetG3DHALorHEL() != hsG3DDeviceSelector::kHHD3DTnLHalDev)) (fRecords[i].GetG3DHALorHEL() != hsG3DDeviceSelector::kHHD3DTnLHalDev))