Some OS X build fixes.

3 files changed, 4 insertions, 5 deletions

diff --git a/test/certificates_test.cc b/test/certificates_test.cc
index c9839d9c..520cb99c 100644
--- a/test/certificates_test.cc
+++ b/test/certificates_test.cc
@@ -23,7 +23,6 @@
 #include "util.h"
 
 using std::list;
-using std::cout;
 using std::string;
 using boost::shared_ptr;
 
diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 4640b36c..7193a5ef 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -31,10 +31,10 @@ static void
 check_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, float gamma)
 {
 	double const * lut = tf->lut (bit_depth);
-	int const count = pow (2, bit_depth);
+	int const count = rint (pow (2.0, bit_depth));
 
 	for (int i = 0; i < count; ++i) {
-		BOOST_CHECK_CLOSE (lut[i], pow (double(i) / (count - 1), gamma), 0.001);
+		BOOST_CHECK_CLOSE (lut[i], pow (float(i) / (count - 1), gamma), 0.001);
 	}
 }
 
@@ -42,7 +42,7 @@ static void
 check_modified_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, double power, double threshold, double A, double B)
 {
 	double const * lut = tf->lut (bit_depth);
-	int const count = pow (2, bit_depth);
+	int const count = rint (pow (2.0, bit_depth));
 
 	for (int i = 0; i < count; ++i) {
 		double const x = double(i) / (count - 1);
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index c41eaf01..5bedf5f6 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 }
 
 static void
-note (dcp::NoteType, string s)
+note (dcp::NoteType, string)
 {
 
 }