[Csp-commits] svn:csp ** test r2001 - in trunk/csp: csplib/util cspsim/battlefield

[<sv...@ww...>]

Author: mkrose
Date: 2006-10-25 00:39:07 -0700 (Wed, 25 Oct 2006)
New Revision: 2001

Modified:
   trunk/csp/csplib/util/LogConstants.h
   trunk/csp/cspsim/battlefield/SimObject.h
Log:
Fix integer overflow warnings under gcc 4.1.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2001

Modified: trunk/csp/csplib/util/LogConstants.h
===================================================================
--- trunk/csp/csplib/util/LogConstants.h	2006-10-13 18:36:26 UTC (rev 2000)
+++ trunk/csp/csplib/util/LogConstants.h	2006-10-25 07:39:07 UTC (rev 2001)
@@ -80,7 +80,7 @@
 
 	// groups
 	cLogCategory_NONE         = 0x00000000,
-	cLogCategory_ALL          = 0xffffffff
+	cLogCategory_ALL          = 0x7fffffff
 };
 
 CSP_NAMESPACE_END

Modified: trunk/csp/cspsim/battlefield/SimObject.h
===================================================================
--- trunk/csp/cspsim/battlefield/SimObject.h	2006-10-13 18:36:26 UTC (rev 2000)
+++ trunk/csp/cspsim/battlefield/SimObject.h	2006-10-25 07:39:07 UTC (rev 2001)
@@ -78,11 +78,11 @@
 	std::vector<ObjectId> m_ContactList;
 	uint32 m_ContactSignature;
 
-	inline void setFlags(int flag, bool on) {
+	inline void setFlags(unsigned flag, bool on) {
 		if (on) m_Flags |= flag; else m_Flags &= ~flag;
 	}
 
-	inline int getFlags(int flags) const {
+	inline int getFlags(unsigned flags) const {
 		return m_Flags & flags;
 	}