Fix warnings
This was SVN commit r10867.
This commit is contained in:
parent
c1c741be9a
commit
6f2eec3c2e
@ -20,6 +20,8 @@
|
||||
# if MSC_VERSION >= 1400
|
||||
# pragma warning(disable:6011) // dereferencing NULL pointer
|
||||
# pragma warning(disable:6246) // local declaration hides declaration of the same name in outer scope
|
||||
# pragma warning(disable:6326) // potential comparison of a constant with another constant
|
||||
# pragma warning(disable:6334) // sizeof operator applied to an expression with an operator might yield unexpected results
|
||||
# endif
|
||||
// .. Intel-specific
|
||||
# if ICC_VERSION
|
||||
|
@ -248,6 +248,8 @@ static void UninstallDriver()
|
||||
}
|
||||
|
||||
|
||||
#if CONFIG2_MAHAF_ATTEMPT_DRIVER_START
|
||||
|
||||
static void StartDriver(const OsPath& driverPathname)
|
||||
{
|
||||
const SC_HANDLE hSCM = OpenServiceControlManager(SC_MANAGER_CREATE_SERVICE);
|
||||
@ -338,6 +340,8 @@ static OsPath DriverPathname()
|
||||
return wutil_ExecutablePath() / filename;
|
||||
}
|
||||
|
||||
#endif // CONFIG2_MAHAF_ATTEMPT_DRIVER_START
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
@ -1463,8 +1463,6 @@ bool CCmpUnitMotion::IsInTargetRange(entity_id_t target, entity_pos_t minRange,
|
||||
if (!cmpObstruction.null())
|
||||
hasObstruction = cmpObstruction->GetObstructionSquare(obstruction);
|
||||
|
||||
entity_pos_t distance;
|
||||
|
||||
if (hasObstruction)
|
||||
{
|
||||
CFixedVector2D halfSize(obstruction.hw, obstruction.hh);
|
||||
|
@ -20,6 +20,10 @@
|
||||
|
||||
#include "../AtlasScript/ScriptInterface.h"
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(disable:4996) // deprecated CRT
|
||||
#endif
|
||||
|
||||
#include "wx/log.h"
|
||||
|
||||
#include <sstream>
|
||||
|
@ -23,6 +23,10 @@
|
||||
# include <cxxabi.h>
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(disable:4996) // deprecated CRT
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
|
||||
#include "GameInterface/Shareable.h"
|
||||
|
@ -26,8 +26,8 @@
|
||||
# define HAVE_PCH 0
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1400
|
||||
# pragma warning(disable: 6334) // TODO: what was this for?
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(disable:4996) // deprecated CRT
|
||||
#endif
|
||||
|
||||
#if HAVE_PCH
|
||||
|
Loading…
Reference in New Issue
Block a user