Răsfoiți Sursa

Fixed warnings.

Branimir Karadžić 7 ani în urmă
părinte
comite
68a69749de
2 a modificat fișierele cu 10 adăugiri și 10 ștergeri
  1. 9 9
      3rdparty/astc/mathlib.cpp
  2. 1 1
      3rdparty/astc/mathlib.h

+ 9 - 9
3rdparty/astc/mathlib.cpp

@@ -1,4 +1,4 @@
-/*----------------------------------------------------------------------------*/  
+/*----------------------------------------------------------------------------*/
 /**
  *	This confidential and proprietary software may be used only as
  *	authorised by a licensing agreement from ARM Limited
@@ -10,8 +10,8 @@
  *	by a licensing agreement from ARM Limited.
  *
  *	@brief	Library of math functions.
- */ 
-/*----------------------------------------------------------------------------*/ 
+ */
+/*----------------------------------------------------------------------------*/
 
 #define _USE_MATH_DEFINES    // for M_PI on windows
 
@@ -61,7 +61,7 @@ float nan(int p)
 	return v.q;
 }
 
-#if (!_MSC_VER) && (__cplusplus < 201103L)
+#if !defined(_MSC_VER) && (__cplusplus < 201103L)
 float fmax(float p, float q)
 {
 	if (p != p)
@@ -116,7 +116,7 @@ float4 fmin(float4 p, float4 q)
 	return float4(fmin(p.x, q.x), fmin(p.y, q.y), fmin(p.z, q.z), fmin(p.w, q.w));
 }
 
-/* 
+/*
    float dot( float2 p, float2 q ) { return p.x*q.x + p.y*q.y; } float dot( float3 p, float3 q ) { return p.x*q.x + p.y*q.y + p.z*q.z; } float dot( float4 p, float4 q ) { return p.x*q.x + p.y*q.y +
    p.z*q.z + p.w*q.w; } */
 
@@ -225,7 +225,7 @@ float4 normalize(float4 p)
 
 *************************************************/
 
-/* 
+/*
 	struct mat2 { float2 v[2]; };
 	struct mat3 { float3 v[3]; };
 	struct mat4 { float4 v[4]; };
@@ -265,7 +265,7 @@ float determinant(mat4 p)
 }
 
 
-/* 
+/*
    characteristic polynomials for matrices. These polynomials are monic, meaning that the coefficient of the highest component is 1; this component is omitted. The first component is the constant
    part. */
 
@@ -293,7 +293,7 @@ float4 characteristic_poly(mat4 p)
 }
 
 
-/* 
+/*
 	Root finders for monic polynomials (highest coefficient is equal to 1)
 
 	Returns a vector with length equal to the number of roots that the polynomial has;
@@ -362,7 +362,7 @@ float3 solve_monic(float3 p)
 }
 
 
-/* 
+/*
  * This function is not overflow-safe. Use with care.
  */
 float4 solve_monic(float4 p)

+ 1 - 1
3rdparty/astc/mathlib.h

@@ -27,7 +27,7 @@ float cospi(float p);
 
 float nan(int p);
 
-#if (!_MSC_VER) && (__cplusplus < 201103L)
+#if !defined(_MSC_VER) && (__cplusplus < 201103L)
 float fmax(float p, float q);
 float fmin(float p, float q);
 #endif  // C++11