From 39fcd3586f905f36f2668850a4be5e77c5d70018 Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Thu, 5 Jan 2006 23:10:54 +0000
Subject: Lots of stupid warning fixes: Added newlines at end of a bunch of
 files that didn't have them. removed a couple of unused variables and an
 extra ';' (Also removed config.h crap from these files)

Kent
---
 extern/bullet/Bullet/CollisionShapes/BoxShape.cpp                     | 3 ++-
 extern/bullet/Bullet/CollisionShapes/ConeShape.h                      | 3 ++-
 extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h                | 3 ++-
 extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.h         | 3 ++-
 extern/bullet/Bullet/CollisionShapes/CylinderShape.h                  | 3 ++-
 extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h                   | 3 ++-
 extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp        | 3 ++-
 extern/bullet/Bullet/CollisionShapes/TriangleCallback.cpp             | 3 ++-
 extern/bullet/Bullet/CollisionShapes/TriangleIndexVertexArray.h       | 3 ++-
 extern/bullet/Bullet/CollisionShapes/TriangleShape.h                  | 3 ++-
 extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h | 3 ++-
 .../bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h | 3 ++-
 extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp           | 3 ++-
 .../bullet/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp   | 3 ++-
 extern/bullet/Bullet/NarrowPhaseCollision/PointCollector.h            | 3 ++-
 extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h           | 3 ++-
 .../bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp | 3 ++-
 extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.h                | 3 ++-
 extern/bullet/BulletDynamics/Dynamics/ContactJoint.h                  | 4 +++-
 extern/bullet/BulletDynamics/Dynamics/MassProps.h                     | 3 ++-
 extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp     | 4 ----
 .../bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp  | 4 ----
 .../bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.cpp | 4 ----
 extern/bullet/LinearMath/AabbUtil2.h                                  | 3 ++-
 extern/bullet/LinearMath/IDebugDraw.h                                 | 3 ++-
 extern/bullet/LinearMath/SimdTransformUtil.h                          | 3 ++-
 26 files changed, 47 insertions(+), 35 deletions(-)

(limited to 'extern')

diff --git a/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp b/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp
index b3274435263..f7492328c02 100644
--- a/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp
+++ b/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp
@@ -50,4 +50,5 @@ void	BoxShape::CalculateLocalInertia(SimdScalar mass,SimdVector3& inertia)
 	inertia[2] = mass/(12.0f) * (lx*lx + ly*ly);
 
 
-}
\ No newline at end of file
+}
+
diff --git a/extern/bullet/Bullet/CollisionShapes/ConeShape.h b/extern/bullet/Bullet/CollisionShapes/ConeShape.h
index 5a6b27c904d..55a6d02c334 100644
--- a/extern/bullet/Bullet/CollisionShapes/ConeShape.h
+++ b/extern/bullet/Bullet/CollisionShapes/ConeShape.h
@@ -70,4 +70,5 @@ public:
 };
 
 
-#endif //CONE_MINKOWSKI_H
\ No newline at end of file
+#endif //CONE_MINKOWSKI_H
+
diff --git a/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h b/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h
index 76c198ab93a..5906b9354c4 100644
--- a/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h
+++ b/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.h
@@ -55,4 +55,5 @@ public:
 };
 
 
-#endif //CONVEX_HULL_SHAPE_H
\ No newline at end of file
+#endif //CONVEX_HULL_SHAPE_H
+
diff --git a/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.h b/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.h
index 8e0e446a549..c9f1a4acffd 100644
--- a/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.h
+++ b/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.h
@@ -46,4 +46,5 @@ int	m_triangleCount;
 };
 
 
-#endif //CONVEX_TRIANGLE_CALLBACK_H
\ No newline at end of file
+#endif //CONVEX_TRIANGLE_CALLBACK_H
+
diff --git a/extern/bullet/Bullet/CollisionShapes/CylinderShape.h b/extern/bullet/Bullet/CollisionShapes/CylinderShape.h
index 8b1cb66685a..e35464ef1d3 100644
--- a/extern/bullet/Bullet/CollisionShapes/CylinderShape.h
+++ b/extern/bullet/Bullet/CollisionShapes/CylinderShape.h
@@ -82,4 +82,5 @@ public:
 };
 
 
-#endif //CYLINDER_MINKOWSKI_H
\ No newline at end of file
+#endif //CYLINDER_MINKOWSKI_H
+
diff --git a/extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h b/extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h
index 911bb9af432..ca71ded41c9 100644
--- a/extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h
+++ b/extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h
@@ -89,4 +89,5 @@ public:
 };
 
 
-#endif //OPTIMIZED_BVH_H
\ No newline at end of file
+#endif //OPTIMIZED_BVH_H
+
diff --git a/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp b/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp
index cbbbdcbe99e..9763a3c02a2 100644
--- a/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp
+++ b/extern/bullet/Bullet/CollisionShapes/StridingMeshInterface.cpp
@@ -76,4 +76,5 @@ void	StridingMeshInterface::InternalProcessAllTriangles(InternalTriangleIndexCal
 		
 		unLockReadOnlyVertexBase(part);
 	}
-}
\ No newline at end of file
+}
+
diff --git a/extern/bullet/Bullet/CollisionShapes/TriangleCallback.cpp b/extern/bullet/Bullet/CollisionShapes/TriangleCallback.cpp
index 6fc69355c2d..64704dc41fd 100644
--- a/extern/bullet/Bullet/CollisionShapes/TriangleCallback.cpp
+++ b/extern/bullet/Bullet/CollisionShapes/TriangleCallback.cpp
@@ -20,4 +20,5 @@ TriangleCallback::~TriangleCallback()
 InternalTriangleIndexCallback::~InternalTriangleIndexCallback()
 {
 
-}
\ No newline at end of file
+}
+
diff --git a/extern/bullet/Bullet/CollisionShapes/TriangleIndexVertexArray.h b/extern/bullet/Bullet/CollisionShapes/TriangleIndexVertexArray.h
index 4784dc3938f..1e82950a344 100644
--- a/extern/bullet/Bullet/CollisionShapes/TriangleIndexVertexArray.h
+++ b/extern/bullet/Bullet/CollisionShapes/TriangleIndexVertexArray.h
@@ -43,4 +43,5 @@ public:
 	virtual void	preallocateVertices(int numverts){}
 	virtual void	preallocateIndices(int numindices){}
 
-};
\ No newline at end of file
+};
+
diff --git a/extern/bullet/Bullet/CollisionShapes/TriangleShape.h b/extern/bullet/Bullet/CollisionShapes/TriangleShape.h
index 60ea95da5d0..570a312da1a 100644
--- a/extern/bullet/Bullet/CollisionShapes/TriangleShape.h
+++ b/extern/bullet/Bullet/CollisionShapes/TriangleShape.h
@@ -143,4 +143,5 @@ public:
 
 };
 
-#endif //OBB_TRIANGLE_MINKOWSKI_H
\ No newline at end of file
+#endif //OBB_TRIANGLE_MINKOWSKI_H
+
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h b/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h
index b8b31377aa7..94f1dafe1bb 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/ContinuousConvexCollision.h
@@ -43,4 +43,5 @@ public:
 
 };
 
-#endif //CONTINUOUS_COLLISION_CONVEX_CAST_H
\ No newline at end of file
+#endif //CONTINUOUS_COLLISION_CONVEX_CAST_H
+
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h
index 8af37e08032..a8fdbc55414 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h
@@ -30,4 +30,5 @@ public:
 
 
 };
-#endif //CONVEX_PENETRATION_DEPTH_H
\ No newline at end of file
+#endif //CONVEX_PENETRATION_DEPTH_H
+
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp
index 45d7403586f..4c129848fe0 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/GjkConvexCast.cpp
@@ -154,4 +154,5 @@ bool	GjkConvexCast::calcTimeOfImpact(
 	}
 
 	return false;
-}
\ No newline at end of file
+}
+
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp
index bb45e5215f3..98e45f6d1df 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp
@@ -30,4 +30,5 @@ void ManifoldContactAddResult::AddContactPoint(const SimdVector3& normalOnBInWor
 	{
 		m_manifoldPtr->AddManifoldPoint(newPt);
 	}
-}
\ No newline at end of file
+}
+
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/PointCollector.h b/extern/bullet/Bullet/NarrowPhaseCollision/PointCollector.h
index f39fa090ae4..e4f22b69f46 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/PointCollector.h
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/PointCollector.h
@@ -33,4 +33,5 @@ struct PointCollector : public DiscreteCollisionDetectorInterface::Result
 	}
 };
 
-#endif //POINT_COLLECTOR_H
\ No newline at end of file
+#endif //POINT_COLLECTOR_H
+
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h b/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h
index 8fc97bb3b40..a1d34dcb2f6 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h
@@ -37,4 +37,5 @@ public:
 	virtual void ProcessTriangle(SimdVector3* triangle);
 };
 
-#endif //RAYCAST_TRI_CALLBACK_H
\ No newline at end of file
+#endif //RAYCAST_TRI_CALLBACK_H
+
diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp
index 4111de679d0..849e57d1088 100644
--- a/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp
+++ b/extern/bullet/BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp
@@ -231,4 +231,5 @@ void Solve2LinearConstraint::resolveAngularConstraint(	const SimdMatrix3x3& invI
 											SimdScalar& imp0,SimdScalar& imp1)
 {
 
-}
\ No newline at end of file
+}
+
diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.h b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.h
index 7edeaba3dd1..37fe09c2607 100644
--- a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.h
+++ b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.h
@@ -41,4 +41,5 @@ int dRandInt2 (int n);
 
 #endif //SOR_LCP_H
 
-#endif //USE_SOR_SOLVER
\ No newline at end of file
+#endif //USE_SOR_SOLVER
+
diff --git a/extern/bullet/BulletDynamics/Dynamics/ContactJoint.h b/extern/bullet/BulletDynamics/Dynamics/ContactJoint.h
index 54cc5283da0..4e1dc8e1669 100644
--- a/extern/bullet/BulletDynamics/Dynamics/ContactJoint.h
+++ b/extern/bullet/BulletDynamics/Dynamics/ContactJoint.h
@@ -30,4 +30,6 @@ public:
 	
 
 };
-#endif //CONTACT_JOINT_H
\ No newline at end of file
+
+#endif //CONTACT_JOINT_H
+
diff --git a/extern/bullet/BulletDynamics/Dynamics/MassProps.h b/extern/bullet/BulletDynamics/Dynamics/MassProps.h
index 892e1c0b9a8..e0e4e87bc8a 100644
--- a/extern/bullet/BulletDynamics/Dynamics/MassProps.h
+++ b/extern/bullet/BulletDynamics/Dynamics/MassProps.h
@@ -15,4 +15,5 @@ struct MassProps {
 };
 
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp
index b8521ffaf87..1bf92b4effc 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp
@@ -13,10 +13,6 @@
 
 #include "PHY_IMotionState.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 PHY_IMotionState::~PHY_IMotionState()
 {
 
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp
index b051a45bd13..655763d0bf6 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp
@@ -13,10 +13,6 @@
 
 #include "PHY_IPhysicsController.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 PHY_IPhysicsController::~PHY_IPhysicsController()
 {
 
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.cpp b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.cpp
index 1794606edf3..f59efad561a 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.cpp
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.cpp
@@ -13,10 +13,6 @@
 
 #include "PHY_IPhysicsEnvironment.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /**
 *	Physics Environment takes care of stepping the simulation and is a container for physics entities (rigidbodies,constraints, materials etc.)
 *	A derived class may be able to 'construct' entities by loading and/or converting
diff --git a/extern/bullet/LinearMath/AabbUtil2.h b/extern/bullet/LinearMath/AabbUtil2.h
index 27172f93139..77271e13202 100644
--- a/extern/bullet/LinearMath/AabbUtil2.h
+++ b/extern/bullet/LinearMath/AabbUtil2.h
@@ -64,4 +64,5 @@ SIMD_FORCE_INLINE bool TestTriangleAgainstAabb2(const SimdVector3 *vertices,
 	return true;
 }
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/extern/bullet/LinearMath/IDebugDraw.h b/extern/bullet/LinearMath/IDebugDraw.h
index be2e421a77e..7734eccf510 100644
--- a/extern/bullet/LinearMath/IDebugDraw.h
+++ b/extern/bullet/LinearMath/IDebugDraw.h
@@ -57,4 +57,5 @@ class	IDebugDraw
 
 };
 
-#endif //IDEBUG_DRAW__H
\ No newline at end of file
+#endif //IDEBUG_DRAW__H
+
diff --git a/extern/bullet/LinearMath/SimdTransformUtil.h b/extern/bullet/LinearMath/SimdTransformUtil.h
index 179e2f51daa..ab3d3f45a30 100644
--- a/extern/bullet/LinearMath/SimdTransformUtil.h
+++ b/extern/bullet/LinearMath/SimdTransformUtil.h
@@ -91,4 +91,5 @@ public:
 
 };
 
-#endif //SIMD_TRANSFORM_UTIL_H
\ No newline at end of file
+#endif //SIMD_TRANSFORM_UTIL_H
+
-- 
cgit v1.2.3