Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid compile error when using glh and boost at the same time.

Browse Source 
Defining a macro in a header that doesn't have any namespace prefix
like GLH_ ugh. Very bad.

Changed the macro into an inline function inside namespace glh.
This commit is contained in:
Aleric Inglewood
2013-09-13 17:22:56 +02:00
parent f838c235cb
commit dcbcc7ea3c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/glh/glh_linear.h
View File

@@ -71,10 +71,10 @@ glh_linear.h
#define GLH_EPSILON GLH_REAL(10e-6) #define GLH_EPSILON GLH_REAL(10e-6)
#define GLH_PI GLH_REAL(3.1415926535897932384626433832795) #define GLH_PI GLH_REAL(3.1415926535897932384626433832795)
#define equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
namespace glh namespace glh
{ {
inline bool equivalent(GLH_REAL a, GLH_REAL b) { return b - GLH_EPSILON < a && a < b + GLH_EPSILON; }
inline GLH_REAL to_degrees(GLH_REAL radians) { return radians*GLH_RAD_TO_DEG; } inline GLH_REAL to_degrees(GLH_REAL radians) { return radians*GLH_RAD_TO_DEG; }
inline GLH_REAL to_radians(GLH_REAL degrees) { return degrees*GLH_DEG_TO_RAD; } inline GLH_REAL to_radians(GLH_REAL degrees) { return degrees*GLH_DEG_TO_RAD; }