diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-06-03 14:19:43 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-06-03 14:19:43 +0000 |
| commit | 448f04aff1e2b96287f37755ef1b12d9339ea135 (patch) | |
| tree | 69e6b8a1107c9c31288ca5563cdc2f0208e69a3d /src | |
| parent | d6c5974dcedc33177c99196b3b94d220346c5f8f (diff) | |
| download | mana-448f04aff1e2b96287f37755ef1b12d9339ea135.tar.gz mana-448f04aff1e2b96287f37755ef1b12d9339ea135.tar.bz2 mana-448f04aff1e2b96287f37755ef1b12d9339ea135.tar.xz mana-448f04aff1e2b96287f37755ef1b12d9339ea135.zip | |
Fixed warning about strict-aliasing rules and don't die on warnings by default.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/utils/fastsqrt.h | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9e6cb4c5..207689cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -281,6 +281,6 @@ INCLUDES = \ # the library search path. tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0` -tmw_CXXFLAGS = -Wall -Werror $(OPENGL_CFLAGS) $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS) +tmw_CXXFLAGS = -Wall $(OPENGL_CFLAGS) $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS) tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(OPENGL_LIBS) $(CURL_LIBS) tmw_TARGET = tmw diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h index 8ba6f8ce..8da1d354 100644 --- a/src/utils/fastsqrt.h +++ b/src/utils/fastsqrt.h @@ -9,15 +9,16 @@ float fastInvSqrt(float x)
{
- float xhalf = 0.5f*x;
- int i = *(int*)&x;
- i = 0x5f375a86- (i>>1);
- x = *(float*)&i;
- x = x*(1.5f-xhalf*x*x);
+ union { int i; float x; } tmp;
+ float xhalf = 0.5f * x;
+ tmp.x = x;
+ tmp.i = 0x5f375a86 - (tmp.i >> 1);
+ x = tmp.x;
+ x = x * (1.5f - xhalf * x * x);
return x;
}
float fastSqrt(float x)
{
- return 1.0f/fastInvSqrt(x);
+ return 1.0f / fastInvSqrt(x);
}
|