Merge branch 'master' into epoxy

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index 61c3918810d1bb9fea9f0ef1da4fcb32690caaf0..ea3a0110ce6e509da802e0d3d9a0eb9deaa1aaf2 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -2,11 +2,11 @@
 #include <math.h>
 #include <stdio.h>
 #include <algorithm>
+#include <epoxy/gl.h>
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>
 
 #include "flat_input.h"
-#include "glew.h"
-#include "gtest/gtest.h"
-#include "gtest/gtest-message.h"
 #include "init.h"
 #include "resource_pool.h"
 #include "test_util.h"
@@ -14,6 +14,8 @@
 
 using namespace std;
 
+namespace movit {
+
 class Input;
 
 namespace {
@@ -244,3 +246,5 @@ void test_accuracy(const float *expected, const float *result, unsigned num_valu
        double rms = sqrt(squared_difference) / num_values;
        EXPECT_LT(rms, rms_limit);
 }
+
+}  // namespace movit