Correctly scope std functions.

Change-Id: I20b0c8cc3ec6263c8f2f65aafed72e29d40cb75c

diff --git a/text/dali/internal/glyphy/glyphy-arc-bezier.hh b/text/dali/internal/glyphy/glyphy-arc-bezier.hh
index a3c71aa..4716e5e 100644 (file)
--- a/text/dali/internal/glyphy/glyphy-arc-bezier.hh
+++ b/text/dali/internal/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 (isfinite (max_d)) {
+    if (std::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 (isfinite (max_d));
+      assert (std::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/text/dali/internal/glyphy/glyphy-blob-impl.cc b/text/dali/internal/glyphy/glyphy-blob-impl.cc
index 84caf28..444747e 100644 (file)
--- a/text/dali/internal/glyphy/glyphy-blob-impl.cc
+++ b/text/dali/internal/glyphy/glyphy-blob-impl.cc
@@ -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 (isinf (d))
+  if (std::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 &&
-          isinf (near_endpoints[2].d) &&
+          std::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/text/dali/internal/glyphy/glyphy-common.hh b/text/dali/internal/glyphy/glyphy-common.hh
index 8d4d02c..7c11687 100644 (file)
--- a/text/dali/internal/glyphy/glyphy-common.hh
+++ b/text/dali/internal/glyphy/glyphy-common.hh
@@ -21,7 +21,7 @@
 
 #include "glyphy.h"
 
-#include <math.h>
+#include <cmath>
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>

diff --git a/text/dali/internal/glyphy/glyphy-extents.cc b/text/dali/internal/glyphy/glyphy-extents.cc
index bccc861..e69e176 100644 (file)
--- a/text/dali/internal/glyphy/glyphy-extents.cc
+++ b/text/dali/internal/glyphy/glyphy-extents.cc
@@ -35,7 +35,7 @@ glyphy_extents_clear (glyphy_extents_t *extents)
 glyphy_bool_t
 glyphy_extents_is_empty (const glyphy_extents_t *extents)
 {
-  return isinf (extents->min_x);
+  return std::isinf (extents->min_x);
 }
 
 void

diff --git a/text/dali/internal/glyphy/glyphy-geometry.hh b/text/dali/internal/glyphy/glyphy-geometry.hh
index 3828676..0a3d734 100644 (file)
--- a/text/dali/internal/glyphy/glyphy-geometry.hh
+++ b/text/dali/internal/glyphy/glyphy-geometry.hh
@@ -254,7 +254,7 @@ inline double Point::squared_distance_to_point (const Point &p) const {
 }
 
 inline bool Point::is_finite (void) const {
-  return isfinite (x) && isfinite (y);
+  return std::isfinite (x) && std::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