[Hgengine-cvs] SF.net SVN: hgengine:[739] Mercury2/src/MercuryMath.h

[<axl...@us...>]

Revision: 739
          http://hgengine.svn.sourceforge.net/hgengine/?rev=739&view=rev
Author:   axlecrusher
Date:     2010-05-18 20:21:39 +0000 (Tue, 18 May 2010)

Log Message:
-----------
fix linux warnings

Modified Paths:
--------------
    Mercury2/src/MercuryMath.h

Modified: Mercury2/src/MercuryMath.h
===================================================================
--- Mercury2/src/MercuryMath.h	2010-05-18 20:14:49 UTC (rev 738)
+++ Mercury2/src/MercuryMath.h	2010-05-18 20:21:39 UTC (rev 739)
@@ -2,6 +2,8 @@
 #define _MERCURYMATH_H
 
 #include <math.h>
+#include <string.h>
+
 #ifdef HGENGINE
 #ifndef WIN32
 #include <configuration.h>
@@ -114,7 +116,9 @@
 //http://graphics.stanford.edu/~seander/bithacks.html
 inline unsigned int SetBit(unsigned int x, unsigned int mask, bool t)
 {
+#if defined(WIN32)
 	#pragma warning( disable : 4804 )
+#endif
 	return ((x & ~mask) | (-t & mask));  /*superscalar CPU version*/
 }
 inline bool GetBit(unsigned int x, unsigned int mask) { return ((x & mask)>0); }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.