From 558d3b0b8cfb34a1d20c8e6ff792a74f4a9d1447 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Tue, 3 Nov 2015 04:23:17 +0300 Subject: [PATCH] Fix warnings --- LunaDll/LuaMain/LuaProxyComponent/LuaProxySection.cpp | 6 +++--- LunaDll/LunaDll.vcxproj | 2 +- LunaDll/Misc/TypeLib.cpp | 4 ++-- LunaDll/libs/boost/boost/config/compiler/visualc.hpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LunaDll/LuaMain/LuaProxyComponent/LuaProxySection.cpp b/LunaDll/LuaMain/LuaProxyComponent/LuaProxySection.cpp index 5158a0bf2..2515295ab 100644 --- a/LunaDll/LuaMain/LuaProxyComponent/LuaProxySection.cpp +++ b/LunaDll/LuaMain/LuaProxyComponent/LuaProxySection.cpp @@ -57,7 +57,7 @@ void LuaProxy::Section::setMusicID(short musicID) bool LuaProxy::Section::isLevelWarp() const { - return (bool)GM_SEC_ISWARP[m_secNum] != 0; + return (bool)(GM_SEC_ISWARP[m_secNum] != 0); } void LuaProxy::Section::setIsLevelWarp(bool isLevelWarp) @@ -87,7 +87,7 @@ void LuaProxy::Section::setBackgroundID(short backgroundID) bool LuaProxy::Section::noTurnBack() const { - return (bool)GM_SEC_NOTURNBACK[m_secNum] != 0; + return (bool)(GM_SEC_NOTURNBACK[m_secNum] != 0); } void LuaProxy::Section::setNoTurnBack(bool noTurnBack) @@ -97,7 +97,7 @@ void LuaProxy::Section::setNoTurnBack(bool noTurnBack) bool LuaProxy::Section::isUnderwater() const { - return (bool)GM_SEC_ISUNDERWATER[m_secNum] != 0; + return (bool)(GM_SEC_ISUNDERWATER[m_secNum] != 0); } void LuaProxy::Section::setIsUnderwater(bool isUnderwater) diff --git a/LunaDll/LunaDll.vcxproj b/LunaDll/LunaDll.vcxproj index 62d2ea2d3..4eff083cc 100644 --- a/LunaDll/LunaDll.vcxproj +++ b/LunaDll/LunaDll.vcxproj @@ -110,7 +110,7 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;FreeImage.lib;version.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;libluabind.lib;lua51.lib;Dbghelp.lib;Ws2_32.lib;SDL2.lib;SDL2_mixer_ext.lib;SDL2main.lib;comsuppw.lib;opengl32.lib;glew32s.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;FreeImage.lib;version.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;libluabind.lib;lua51.lib;Dbghelp.lib;Ws2_32.lib;SDL2.lib;SDL2main.lib;SDL2_mixer_ext.lib;comsuppw.lib;opengl32.lib;glew32s.lib;%(AdditionalDependencies) true diff --git a/LunaDll/Misc/TypeLib.cpp b/LunaDll/Misc/TypeLib.cpp index 9e111712b..eaf834aa3 100644 --- a/LunaDll/Misc/TypeLib.cpp +++ b/LunaDll/Misc/TypeLib.cpp @@ -188,7 +188,7 @@ bool TypeLib::NextFunction() { } bool TypeLib::HasFunctionTypeFlag(TYPEFLAG tf) { - return curImplTypeFlags_ & static_cast(tf); + return ((curImplTypeFlags_&static_cast(tf))!=0); } std::string TypeLib::ConstValue() { @@ -338,7 +338,7 @@ bool TypeLib::ParameterHasCustumData() { } bool TypeLib::ParameterIsHasX(int flag) { ELEMDESC e = curFuncDesc_->lprgelemdescParam[curFuncParam_]; - return e.paramdesc.wParamFlags & flag; + return ((e.paramdesc.wParamFlags & flag)!=0); } void TypeLib::ReleaseFuncNames() { diff --git a/LunaDll/libs/boost/boost/config/compiler/visualc.hpp b/LunaDll/libs/boost/boost/config/compiler/visualc.hpp index 842f08651..c015c022e 100644 --- a/LunaDll/libs/boost/boost/config/compiler/visualc.hpp +++ b/LunaDll/libs/boost/boost/config/compiler/visualc.hpp @@ -253,7 +253,7 @@ // // last known and checked version is 18.00.20827.3 (VC12 RC, aka 2013 RC): -#if (_MSC_VER > 1800 && _MSC_FULL_VER > 180020827) +#if (_MSC_VER > 1900 && _MSC_FULL_VER > 190023027) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else