Commit 39f3cc18 authored by Kenneth Moreland's avatar Kenneth Moreland

Merge branch 'fix-compilation-errors' into 'master'

Fix compilation errors

Compilation error on Visual Studio 10 Win 64.
Fix undefined symbol: TEST_NOT_PASSED

See merge request !3
parents 6a6b26af a6ba1621
...@@ -1491,10 +1491,11 @@ static int SimpleTimingDoScalingStudyFactor2() ...@@ -1491,10 +1491,11 @@ static int SimpleTimingDoScalingStudyFactor2()
} }
if (has_group) { if (has_group) {
IceTContext new_context; IceTContext new_context;
int result;
new_context = icetCreateContext(new_comm); new_context = icetCreateContext(new_comm);
new_comm->Destroy(new_comm); new_comm->Destroy(new_comm);
int result = SimpleTimingDoParameterStudies(); result = SimpleTimingDoParameterStudies();
if (result != TEST_PASSED) { worst_result = result; } if (result != TEST_PASSED) { worst_result = result; }
icetSetContext(original_context); icetSetContext(original_context);
......
...@@ -37,6 +37,8 @@ static int windowId; ...@@ -37,6 +37,8 @@ static int windowId;
static GLFWwindow *window; static GLFWwindow *window;
#endif #endif
#include "test_codes.h"
static void checkOglError(void) static void checkOglError(void)
{ {
GLenum error = glGetError(); GLenum error = glGetError();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment