From 55ed12f8d1eb6887d348be03aee5573d44177ffb Mon Sep 17 00:00:00 2001 From: Michael Sartain Date: Thu, 2 Oct 2014 08:25:55 -0700 Subject: Updated the SDK with the latest code from the TF and HL2 branches. --- mp/src/public/mathlib/mathlib.h | 2 +- mp/src/public/mathlib/vmatrix.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'mp/src/public/mathlib') diff --git a/mp/src/public/mathlib/mathlib.h b/mp/src/public/mathlib/mathlib.h index f734ae68..bd6f3027 100644 --- a/mp/src/public/mathlib/mathlib.h +++ b/mp/src/public/mathlib/mathlib.h @@ -457,7 +457,7 @@ void inline SinCos( float radians, float *sine, float *cosine ) *sine = sin( radians ); *cosine = cos( radians ); #elif defined( POSIX ) - register double __cosr, __sinr; + double __cosr, __sinr; __asm ("fsincos" : "=t" (__cosr), "=u" (__sinr) : "0" (radians)); *sine = __sinr; diff --git a/mp/src/public/mathlib/vmatrix.h b/mp/src/public/mathlib/vmatrix.h index c18e4822..e49a888d 100644 --- a/mp/src/public/mathlib/vmatrix.h +++ b/mp/src/public/mathlib/vmatrix.h @@ -107,7 +107,6 @@ public: void PreTranslate(const Vector &vTrans); void PostTranslate(const Vector &vTrans); - matrix3x4_t& As3x4(); const matrix3x4_t& As3x4() const; void CopyFrom3x4( const matrix3x4_t &m3x4 ); void Set3x4( matrix3x4_t& matrix3x4 ) const; @@ -630,11 +629,6 @@ inline const matrix3x4_t& VMatrix::As3x4() const return *((const matrix3x4_t*)this); } -inline matrix3x4_t& VMatrix::As3x4() -{ - return *((matrix3x4_t*)this); -} - inline void VMatrix::CopyFrom3x4( const matrix3x4_t &m3x4 ) { memcpy( m, m3x4.Base(), sizeof( matrix3x4_t ) ); -- cgit v1.2.3