X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.h;h=f62618c404325ef7ef44f2b5b02326e208fc32c7;hp=5839e5b6c4ce1ccd52ac65f2364a9d6c1e095663;hb=ca4d87878bb32c7d672ac00f41ca0292f19acfcb;hpb=37f56fcbe571b2322243f6de59494bf9e0cbb37a

diff --git a/util.h b/util.h
index 5839e5b..f62618c 100644
--- a/util.h
+++ b/util.h
@@ -1,5 +1,5 @@
-#ifndef _UTIL_H
-#define _UTIL_H 1
+#ifndef _MOVIT_UTIL_H
+#define _MOVIT_UTIL_H 1
 
 // Various utilities.
 
@@ -11,6 +11,8 @@
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
+namespace movit {
+
 // Converts a HSV color to RGB. Assumes h in [0, 2pi> or [-pi, pi>
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b);
 
@@ -41,16 +43,12 @@ std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m);
 // (estimated) squared errors of the two weights.
 void combine_two_samples(float w1, float w2, float *offset, float *total_weight, float *sum_sq_error);
 
+}  // namespace movit
+
 #ifdef NDEBUG
 #define check_error()
 #else
-#define check_error() { int err = glGetError(); if (err != GL_NO_ERROR) { printf("GL error 0x%x at %s:%d\n", err, __FILE__, __LINE__); exit(1); } }
-#endif
-
-#ifdef __GNUC__
-#define MUST_CHECK_RESULT __attribute__((warn_unused_result))
-#else
-#define MUST_CHECK_RESULT 
+#define check_error() { int err = glGetError(); if (err != GL_NO_ERROR) { printf("GL error 0x%x at %s:%d\n", err, __FILE__, __LINE__); abort(); } }
 #endif
 
 // CHECK() is like assert(), but retains any side effects no matter the compilation mode.
@@ -60,4 +58,4 @@ void combine_two_samples(float w1, float w2, float *offset, float *total_weight,
 #define CHECK(x) do { bool ok = x; if (!ok) { fprintf(stderr, "%s:%d: %s: Assertion `%s' failed.\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #x); abort(); } } while (false)
 #endif
 
-#endif // !defined(_UTIL_H)
+#endif // !defined(_MOVIT_UTIL_H)