Fix warnings

WohlSoft · Nov 3, 2015 · 558d3b0 · 558d3b0
1 parent b485f01
commit 558d3b0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -110,7 +110,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <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;SDL2_mixer_ext.lib;SDL2main.lib;comsuppw.lib;opengl32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
       <ForceFileOutput>
       </ForceFileOutput>
       <GenerateMapFile>true</GenerateMapFile>

diff --git 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<int>(tf);
+  return ((curImplTypeFlags_&static_cast<int>(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
@@ -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