From b48525ef46178731d251d38e0f982f7aa6a1f16e Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 2 Jun 2019 21:39:37 +1000 Subject: [PATCH] fix msvc build --- src/common/Util/UtilMath.cpp | 3 ++- src/common/Util/UtilMath.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/Util/UtilMath.cpp b/src/common/Util/UtilMath.cpp index a1e1a01e..ae61e171 100644 --- a/src/common/Util/UtilMath.cpp +++ b/src/common/Util/UtilMath.cpp @@ -17,7 +17,8 @@ float Util::distance( float x, float y, float z, float x1, float y1, float z1 ) return sqrtf( distanceSq( x, y, z, x1, y1, z1 ) ); } -float Util::distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 ) +float Util::distance( const Sapphire::Common::FFXIVARR_POSITION3& pos1, + const Sapphire::Common::FFXIVARR_POSITION3& pos2 ) { return sqrtf( distanceSq( pos1.x, pos1.y, pos1.z, pos2.x, pos2.y, pos2.z ) ); } diff --git a/src/common/Util/UtilMath.h b/src/common/Util/UtilMath.h index c35ef6be..93344253 100644 --- a/src/common/Util/UtilMath.h +++ b/src/common/Util/UtilMath.h @@ -11,7 +11,7 @@ namespace Sapphire::Common::Util float distanceSq( float x, float y, float z, float x1, float y1, float z1 ); float distance( float x, float y, float z, float x1, float y1, float z1 ); - float distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 ); + float distance( const Sapphire::Common::FFXIVARR_POSITION3& pos1, const Sapphire::Common::FFXIVARR_POSITION3& pos2 ); float distance2DSq( float x, float y, float x1, float y1 );