Fixed conflict with Boost, ticket #158

2012-01-08 13:13:18 +00:00
parent c7d752cdf8
commit 040ea3ce7e
4 changed files with 30 additions and 17 deletions
--- a/test/core/core_func_common.cpp
+++ b/test/core/core_func_common.cpp
@@ -7,12 +7,13 @@
 // File    : test/core/func_common.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////

-#include <glm/glm.hpp>
-#include <glm/gtx/epsilon.hpp>
-#include <cstdio>
 #include <boost/array.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread/thread.hpp>
+#include <glm/glm.hpp>
+#include <glm/ext.hpp>
+#include <glm/gtx/epsilon.hpp>
+#include <cstdio>

 int test_modf()
 {