More explicit typecasts.

nickgammon · Sep 16, 2010 · 3fff4c5 · 3fff4c5
1 parent c043e3c
commit 3fff4c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scripting/methods.cpp b/scripting/methods.cpp
@@ -10684,7 +10684,7 @@ set<string> errors;
 
     if (lua_isnumber (App.m_SpellChecker_Lua, -1))
       {
-      SetUpVariantLong (vaResult, lua_tonumber (App.m_SpellChecker_Lua, -1));        // no errors
+      SetUpVariantLong (vaResult, (long) lua_tonumber (App.m_SpellChecker_Lua, -1));        // no errors
   	  return vaResult;
       }
 
@@ -11797,7 +11797,7 @@ POSITION pos;
   if (!m_LineList.IsEmpty ())
     {
     m_pCurrentLine = m_LineList.GetTail ();
-    if ((m_pCurrentLine->flags & COMMENT == 0) ||
+    if (((m_pCurrentLine->flags & COMMENT) == 0) ||
         m_pCurrentLine->hard_return)
         m_pCurrentLine = NULL;
     }
@@ -11933,7 +11933,7 @@ BOOL CMUSHclientDoc::Transparency(long Key, short Amount)
   else if (Amount > MWT_MAX_FACTOR)
     Amount = MWT_MAX_FACTOR;
 
-  return MakeWindowTransparent (App.m_pMainWnd->m_hWnd, Key, Amount);
+  return MakeWindowTransparent (App.m_pMainWnd->m_hWnd, Key, (unsigned char) Amount);
 }
 
 

diff --git a/stdafx.h b/stdafx.h
@@ -167,7 +167,7 @@ enum { BLACK = 0, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE };
 #define PLURALES(arg) (arg), (arg) == 1 ? "" : "es"
 
 // number of items in an array
-#define NUMITEMS(arg) (sizeof (arg) / sizeof (arg [0]))
+#define NUMITEMS(arg) ((unsigned int) (sizeof (arg) / sizeof (arg [0])))
 
 #define DEFAULT_CHAT_PORT 4050
 #define DEFAULT_CHAT_NAME "Name-not-set"