diff --git a/main/source/cl_dll/hud_crosshairs.h b/main/source/cl_dll/hud_crosshairs.h index 4934b23e..27fd7825 100644 --- a/main/source/cl_dll/hud_crosshairs.h +++ b/main/source/cl_dll/hud_crosshairs.h @@ -25,12 +25,12 @@ class CHudCrosshairs : public CHudBase cvar_t* cl_cross_line_left; cvar_t* cl_cross_line_right; -#ifdef __APPLE__ - //Remove when OSX builds with c++11 -#else +//#ifdef __APPLE__ +// //Remove when OSX builds with c++11 +//#else float old_circle_radius; std::vector circle_points; -#endif +//#endif public: virtual int Init(); diff --git a/main/source/cl_dll/hudgl.cpp b/main/source/cl_dll/hudgl.cpp index 60d99da7..e9b2f9ad 100644 --- a/main/source/cl_dll/hudgl.cpp +++ b/main/source/cl_dll/hudgl.cpp @@ -75,9 +75,9 @@ void HudGL::rectangle(const Vector2D& corner_a, const Vector2D& corner_b) const glEnd(); } -#ifdef __APPLE__ -//Remove when OSX builds with c++11 -#else +//#ifdef __APPLE__ +////Remove when OSX builds with c++11 +//#else std::vector HudGL::compute_circle(float radius) { // Maximum allowed distance between the circle and the rendered line segment. const float MAX_ERROR = 0.1f; @@ -94,4 +94,4 @@ std::vector HudGL::compute_circle(float radius) { return points; } -#endif \ No newline at end of file +//#endif \ No newline at end of file diff --git a/main/source/cl_dll/hudgl.h b/main/source/cl_dll/hudgl.h index 49ad88cc..4fe3137b 100644 --- a/main/source/cl_dll/hudgl.h +++ b/main/source/cl_dll/hudgl.h @@ -9,16 +9,16 @@ public: void color(unsigned char r, unsigned char g, unsigned char b, unsigned char a) const; void line_width(float width) const; void line(const Vector2D& start, const Vector2D& end) const; -#ifdef __APPLE__ - //Remove when OSX builds with c++11 -#else +//#ifdef __APPLE__ +// //Remove when OSX builds with c++11 +//#else void circle(const Vector2D& center, const std::vector& points) const; -#endif +//#endif void rectangle(const Vector2D& corner_a, const Vector2D& corner_b) const; -#ifdef __APPLE__ - //Remove when OSX builds with c++11 -#else +//#ifdef __APPLE__ +// //Remove when OSX builds with c++11 +//#else static std::vector compute_circle(float radius); -#endif +//#endif };