From fc5f9ed56b2baeea2e3e0cc74630f19f2ffa695a Mon Sep 17 00:00:00 2001
From: dhewg <dhewg@wiibrew.org>
Date: Tue, 6 Dec 2011 19:13:18 +0100
Subject: [PATCH] Mark unused variables in a non-debug build as such
Variables which are only used in assert().
---
d3xp/Game_local.cpp | 2 +-
d3xp/Game_network.cpp | 4 ++--
d3xp/physics/Physics_AF.cpp | 4 ++--
d3xp/physics/Physics_StaticMulti.cpp | 2 +-
game/Game_local.cpp | 2 +-
game/Game_network.cpp | 4 ++--
game/physics/Physics_AF.cpp | 4 ++--
idlib/math/Matrix.h | 24 ++++++++++++------------
idlib/math/Polynomial.cpp | 2 +-
9 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/d3xp/Game_local.cpp b/d3xp/Game_local.cpp
index d68b1a3..97b6b4a 100644
--- a/d3xp/Game_local.cpp
+++ b/d3xp/Game_local.cpp
@@ -3111,7 +3111,7 @@ idGameLocal::AddAASObstacle
aasHandle_t idGameLocal::AddAASObstacle( const idBounds &bounds ) {
int i;
aasHandle_t obstacle;
- aasHandle_t check;
+ aasHandle_t check id_attribute((unused));
if ( !aasList.Num() ) {
return -1;
diff --git a/d3xp/Game_network.cpp b/d3xp/Game_network.cpp
index 732329a..ca979d8 100644
--- a/d3xp/Game_network.cpp
+++ b/d3xp/Game_network.cpp
@@ -764,7 +764,7 @@ void idGameLocal::ServerProcessEntityNetworkEventQueue( void ) {
}
}
- entityNetEvent_t* freedEvent = eventQueue.Dequeue();
+ entityNetEvent_t* freedEvent id_attribute((unused)) = eventQueue.Dequeue();
assert( freedEvent == event );
eventQueue.Free( event );
}
@@ -1312,7 +1312,7 @@ void idGameLocal::ClientProcessEntityNetworkEventQueue( void ) {
}
}
- entityNetEvent_t* freedEvent = eventQueue.Dequeue();
+ entityNetEvent_t* freedEvent id_attribute((unused)) = eventQueue.Dequeue();
assert( freedEvent == event );
eventQueue.Free( event );
}
diff --git a/d3xp/physics/Physics_AF.cpp b/d3xp/physics/Physics_AF.cpp
index 7bc55c6..d994571 100644
--- a/d3xp/physics/Physics_AF.cpp
+++ b/d3xp/physics/Physics_AF.cpp
@@ -993,7 +993,7 @@ idAFConstraint_UniversalJoint::SetShafts
*/
void idAFConstraint_UniversalJoint::SetShafts( const idVec3 &cardanShaft1, const idVec3 &cardanShaft2 ) {
idVec3 cardanAxis;
- float l;
+ float l id_attribute((unused));
shaft1 = cardanShaft1;
l = shaft1.Normalize();
@@ -7963,7 +7963,7 @@ idPhysics_AF::ReadFromSnapshot
================
*/
void idPhysics_AF::ReadFromSnapshot( const idBitMsgDelta &msg ) {
- int i, num;
+ int i, num id_attribute((unused));
idCQuat quat;
current.atRest = msg.ReadLong();
diff --git a/d3xp/physics/Physics_StaticMulti.cpp b/d3xp/physics/Physics_StaticMulti.cpp
index 7b87b5b..df2c293 100644
--- a/d3xp/physics/Physics_StaticMulti.cpp
+++ b/d3xp/physics/Physics_StaticMulti.cpp
@@ -1023,7 +1023,7 @@ idPhysics_StaticMulti::ReadFromSnapshot
================
*/
void idPhysics_StaticMulti::ReadFromSnapshot( const idBitMsgDelta &msg ) {
- int i, num;
+ int i, num id_attribute((unused));
idCQuat quat, localQuat;
num = msg.ReadByte();
diff --git a/game/Game_local.cpp b/game/Game_local.cpp
index 6371f4f..3df910a 100644
--- a/game/Game_local.cpp
+++ b/game/Game_local.cpp
@@ -2846,7 +2846,7 @@ idGameLocal::AddAASObstacle
aasHandle_t idGameLocal::AddAASObstacle( const idBounds &bounds ) {
int i;
aasHandle_t obstacle;
- aasHandle_t check;
+ aasHandle_t check id_attribute((unused));
if ( !aasList.Num() ) {
return -1;
diff --git a/game/Game_network.cpp b/game/Game_network.cpp
index e2be04d..28c448e 100644
--- a/game/Game_network.cpp
+++ b/game/Game_network.cpp
@@ -750,7 +750,7 @@ void idGameLocal::ServerProcessEntityNetworkEventQueue( void ) {
}
}
- entityNetEvent_t* freedEvent = eventQueue.Dequeue();
+ entityNetEvent_t* freedEvent id_attribute((unused)) = eventQueue.Dequeue();
assert( freedEvent == event );
eventQueue.Free( event );
}
@@ -1280,7 +1280,7 @@ void idGameLocal::ClientProcessEntityNetworkEventQueue( void ) {
}
}
- entityNetEvent_t* freedEvent = eventQueue.Dequeue();
+ entityNetEvent_t* freedEvent id_attribute((unused)) = eventQueue.Dequeue();
assert( freedEvent == event );
eventQueue.Free( event );
}
diff --git a/game/physics/Physics_AF.cpp b/game/physics/Physics_AF.cpp
index 8c8bc0d..77766df 100644
--- a/game/physics/Physics_AF.cpp
+++ b/game/physics/Physics_AF.cpp
@@ -993,7 +993,7 @@ idAFConstraint_UniversalJoint::SetShafts
*/
void idAFConstraint_UniversalJoint::SetShafts( const idVec3 &cardanShaft1, const idVec3 &cardanShaft2 ) {
idVec3 cardanAxis;
- float l;
+ float l id_attribute((unused));
shaft1 = cardanShaft1;
l = shaft1.Normalize();
@@ -7962,7 +7962,7 @@ idPhysics_AF::ReadFromSnapshot
================
*/
void idPhysics_AF::ReadFromSnapshot( const idBitMsgDelta &msg ) {
- int i, num;
+ int i, num id_attribute((unused));
idCQuat quat;
current.atRest = msg.ReadLong();
diff --git a/idlib/math/Matrix.h b/idlib/math/Matrix.h
index 40f444c..44fcdfd 100644
--- a/idlib/math/Matrix.h
+++ b/idlib/math/Matrix.h
@@ -295,7 +295,7 @@ ID_INLINE idMat2 idMat2::Inverse( void ) const {
idMat2 invMat;
invMat = *this;
- int r = invMat.InverseSelf();
+ int r id_attribute((unused)) = invMat.InverseSelf();
assert( r );
return invMat;
}
@@ -304,7 +304,7 @@ ID_INLINE idMat2 idMat2::InverseFast( void ) const {
idMat2 invMat;
invMat = *this;
- int r = invMat.InverseFastSelf();
+ int r id_attribute((unused)) = invMat.InverseFastSelf();
assert( r );
return invMat;
}
@@ -700,7 +700,7 @@ ID_INLINE idMat3 idMat3::Inverse( void ) const {
idMat3 invMat;
invMat = *this;
- int r = invMat.InverseSelf();
+ int r id_attribute((unused)) = invMat.InverseSelf();
assert( r );
return invMat;
}
@@ -709,7 +709,7 @@ ID_INLINE idMat3 idMat3::InverseFast( void ) const {
idMat3 invMat;
invMat = *this;
- int r = invMat.InverseFastSelf();
+ int r id_attribute((unused)) = invMat.InverseFastSelf();
assert( r );
return invMat;
}
@@ -1108,7 +1108,7 @@ ID_INLINE idMat4 idMat4::Inverse( void ) const {
idMat4 invMat;
invMat = *this;
- int r = invMat.InverseSelf();
+ int r id_attribute((unused)) = invMat.InverseSelf();
assert( r );
return invMat;
}
@@ -1117,7 +1117,7 @@ ID_INLINE idMat4 idMat4::InverseFast( void ) const {
idMat4 invMat;
invMat = *this;
- int r = invMat.InverseFastSelf();
+ int r id_attribute((unused)) = invMat.InverseFastSelf();
assert( r );
return invMat;
}
@@ -1413,7 +1413,7 @@ ID_INLINE idMat5 idMat5::Inverse( void ) const {
idMat5 invMat;
invMat = *this;
- int r = invMat.InverseSelf();
+ int r id_attribute((unused)) = invMat.InverseSelf();
assert( r );
return invMat;
}
@@ -1422,7 +1422,7 @@ ID_INLINE idMat5 idMat5::InverseFast( void ) const {
idMat5 invMat;
invMat = *this;
- int r = invMat.InverseFastSelf();
+ int r id_attribute((unused)) = invMat.InverseFastSelf();
assert( r );
return invMat;
}
@@ -1740,7 +1740,7 @@ ID_INLINE idMat6 idMat6::Inverse( void ) const {
idMat6 invMat;
invMat = *this;
- int r = invMat.InverseSelf();
+ int r id_attribute((unused)) = invMat.InverseSelf();
assert( r );
return invMat;
}
@@ -1749,7 +1749,7 @@ ID_INLINE idMat6 idMat6::InverseFast( void ) const {
idMat6 invMat;
invMat = *this;
- int r = invMat.InverseFastSelf();
+ int r id_attribute((unused)) = invMat.InverseFastSelf();
assert( r );
return invMat;
}
@@ -2584,7 +2584,7 @@ ID_INLINE idMatX idMatX::Inverse( void ) const {
invMat.SetTempSize( numRows, numColumns );
memcpy( invMat.mat, mat, numRows * numColumns * sizeof( float ) );
- int r = invMat.InverseSelf();
+ int r id_attribute((unused)) = invMat.InverseSelf();
assert( r );
return invMat;
}
@@ -2620,7 +2620,7 @@ ID_INLINE idMatX idMatX::InverseFast( void ) const {
invMat.SetTempSize( numRows, numColumns );
memcpy( invMat.mat, mat, numRows * numColumns * sizeof( float ) );
- int r = invMat.InverseFastSelf();
+ int r id_attribute((unused)) = invMat.InverseFastSelf();
assert( r );
return invMat;
}
diff --git a/idlib/math/Polynomial.cpp b/idlib/math/Polynomial.cpp
index 4ee475f..d539dd1 100644
--- a/idlib/math/Polynomial.cpp
+++ b/idlib/math/Polynomial.cpp
@@ -187,7 +187,7 @@ idPolynomial::Test
*/
void idPolynomial::Test( void ) {
int i, num;
- float roots[4], value;
+ float roots[4], value id_attribute((unused));
idComplex complexRoots[4], complexValue;
idPolynomial p;