commit bfe558f66df53ff241c3b72a5e61e00550d32d40
parent 7722796e9a0c6ce95a5674af4ed06e285b6a958c
Author: Kyle Milz <kyle@getaddrinfo.net>
Date: Sat, 19 Mar 2016 20:37:28 -0600
viewer/glyphy: don't compile with std=c++11
Diffstat:
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/viewer/glyphy/Makefile b/viewer/glyphy/Makefile
@@ -8,7 +8,7 @@ SRCS += glyphy-arc.cxx \
glyphy-sdf.cxx \
glyphy-shaders.cxx
-CXXFLAGS += -std=c++11 -I. -DPKGDATADIR=""
+CXXFLAGS += -I. -DPKGDATADIR=""
NOPROFILE=1
NO_PROFILE=1
diff --git a/viewer/glyphy/glyphy-arc-bezier.hh b/viewer/glyphy/glyphy-arc-bezier.hh
@@ -182,13 +182,13 @@ class ArcBezierApproximatorQuantized
Arc a (b.p0, b.p3, b.point (mid_t), false);
Arc orig_a = a;
- if (std::isfinite (max_d)) {
+ if (isfinite (max_d)) {
assert (max_d >= 0);
if (fabs (a.d) > max_d)
a.d = a.d < 0 ? -max_d : max_d;
}
if (d_bits && max_d != 0) {
- assert (std::isfinite (max_d));
+ assert (isfinite (max_d));
assert (fabs (a.d) <= max_d);
int mult = (1 << (d_bits - 1)) - 1;
int id = round (a.d / max_d * mult);
diff --git a/viewer/glyphy/glyphy-blob.cxx b/viewer/glyphy/glyphy-blob.cxx
@@ -43,7 +43,7 @@ arc_endpoint_encode (unsigned int ix, unsigned int iy, double d)
assert (ix <= MAX_X);
assert (iy <= MAX_Y);
unsigned int id;
- if (std::isinf (d))
+ if (isinf (d))
id = 0;
else {
assert (fabs (d) <= GLYPHY_MAX_D);
@@ -252,7 +252,7 @@ glyphy_arc_list_encode_blob (const glyphy_arc_endpoint_t *endpoints,
/* If the arclist is two arcs that can be combined in encoding if reordered,
* do that. */
if (near_endpoints.size () == 4 &&
- std::isinf (near_endpoints[2].d) &&
+ isinf (near_endpoints[2].d) &&
near_endpoints[0].p.x == near_endpoints[3].p.x &&
near_endpoints[0].p.y == near_endpoints[3].p.y)
{
diff --git a/viewer/glyphy/glyphy-extents.cxx b/viewer/glyphy/glyphy-extents.cxx
@@ -35,7 +35,7 @@ glyphy_extents_clear (glyphy_extents_t *extents)
glyphy_bool_t
glyphy_extents_is_empty (const glyphy_extents_t *extents)
{
- return std::isinf (extents->min_x);
+ return isinf (extents->min_x);
}
void
diff --git a/viewer/glyphy/glyphy-geometry.hh b/viewer/glyphy/glyphy-geometry.hh
@@ -255,7 +255,7 @@ inline double Point::squared_distance_to_point (const Point &p) const {
}
inline bool Point::is_finite (void) const {
- return std::isfinite (x) && std::isfinite (y);
+ return isfinite (x) && isfinite (y);
}
inline const Point Point::lerp (const double &a, const Point &p) const {
/* The following two cases are special-cased to get better floating