aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Grids/GridDefines.h
diff options
context:
space:
mode:
authorJared P. Jones <jjones@uvora.com>2014-07-23 16:13:30 -0500
committerJared P. Jones <jjones@uvora.com>2014-07-23 17:30:45 -0500
commit11ecd851a1432082516bde082063065ec615d5ba (patch)
tree2df33be0539b90ff5be9031f25fa4c1c1ee54d4d /src/server/game/Grids/GridDefines.h
parent1116e8544dd1d7cbf56432e959b3549195980aff (diff)
Core/Misc: Silenced 500 OS X Warnings and removed deprecated finite() method.
*Mac OS X fires off over 200 warnings related to gsoap about the deprecated register method. CMake has been patched to remove this warning. *Updated all occurences of finite() to std::isfinite. The method finite() is not standardized by anyone aside from BSD. std::isfinite() however is standarized by C++ *Removed -ncurses and -pthread from OS X compilation. Now that we use Boost and C++11 there is no longer a need for pthread in OS X. All it does is throw a warning. However, ncurses isn't needed either as it's built into the OS X SDK and linked by default. Note: There are only 5 remaining warnings left when compiling on OS X. I did not attempt to fix these as they were related to 3rd party libraries statically linked into the code. The 5 warnings left are all related to unused variables.
Diffstat (limited to 'src/server/game/Grids/GridDefines.h')
-rw-r--r--src/server/game/Grids/GridDefines.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index 5279f437f89..013d0ef5794 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -213,7 +213,7 @@ namespace Trinity
inline bool IsValidMapCoord(float c)
{
- return finite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5f);
+ return std::isfinite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5f);
}
inline bool IsValidMapCoord(float x, float y)
@@ -223,12 +223,12 @@ namespace Trinity
inline bool IsValidMapCoord(float x, float y, float z)
{
- return IsValidMapCoord(x, y) && finite(z);
+ return IsValidMapCoord(x, y) && std::isfinite(z);
}
inline bool IsValidMapCoord(float x, float y, float z, float o)
{
- return IsValidMapCoord(x, y, z) && finite(o);
+ return IsValidMapCoord(x, y, z) && std::isfinite(o);
}
}
#endif