From 0365c619dc06241a4f850fc95a343ddb505ffc84 Mon Sep 17 00:00:00 2001
From: Michael Sherman <sherm1@gmail.com>
Date: Sun, 29 Jan 2017 15:08:53 -0800
Subject: [PATCH 1/2] Add a missing "using" to get the floating abs on OSX
 (fixes #4955).

---
 .../test/cylinder_torque_free_analytical_solution.cc           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drake/multibody/benchmarks/cylinder_torque_free_analytical_solution/test/cylinder_torque_free_analytical_solution.cc b/drake/multibody/benchmarks/cylinder_torque_free_analytical_solution/test/cylinder_torque_free_analytical_solution.cc
index 9a0d7ce7e00b..e0c83f5535fb 100644
--- a/drake/multibody/benchmarks/cylinder_torque_free_analytical_solution/test/cylinder_torque_free_analytical_solution.cc
+++ b/drake/multibody/benchmarks/cylinder_torque_free_analytical_solution/test/cylinder_torque_free_analytical_solution.cc
@@ -112,7 +112,8 @@ T CalculateQuaternionDtConstraintFromQuaternionDt(
 template <typename T>
 bool TestQuaternionDtConstraintFromQuaternionDt(
     const Eigen::Quaternion<T>& quat, const Vector4<T>& quatDt) {
-
+  using std::abs;
+  
   // For an accurate test, the quaternion should be reasonably accurate.
   const double double_epsilon = std::numeric_limits<double>::epsilon();
   const double tolerance = 800 * double_epsilon;

From 93afc9966d8ea64728722f7eac39419c0fe9d51a Mon Sep 17 00:00:00 2001
From: Michael Sherman <sherm1@gmail.com>
Date: Sun, 29 Jan 2017 17:05:18 -0800
Subject: [PATCH 2/2] Fix cpplint whitespace complaint.

---
 .../test/cylinder_torque_free_analytical_solution.cc            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drake/multibody/benchmarks/cylinder_torque_free_analytical_solution/test/cylinder_torque_free_analytical_solution.cc b/drake/multibody/benchmarks/cylinder_torque_free_analytical_solution/test/cylinder_torque_free_analytical_solution.cc
index e0c83f5535fb..dfe30b7c5262 100644
--- a/drake/multibody/benchmarks/cylinder_torque_free_analytical_solution/test/cylinder_torque_free_analytical_solution.cc
+++ b/drake/multibody/benchmarks/cylinder_torque_free_analytical_solution/test/cylinder_torque_free_analytical_solution.cc
@@ -113,7 +113,7 @@ template <typename T>
 bool TestQuaternionDtConstraintFromQuaternionDt(
     const Eigen::Quaternion<T>& quat, const Vector4<T>& quatDt) {
   using std::abs;
-  
+
   // For an accurate test, the quaternion should be reasonably accurate.
   const double double_epsilon = std::numeric_limits<double>::epsilon();
   const double tolerance = 800 * double_epsilon;