diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2017-07-25 12:17:19 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2017-07-25 12:17:19 +0000 |
| commit | b82b890314bfc64364f38e69696f7c6596ec3536 (patch) | |
| tree | 527465f26fab6db7d414ca5356feb7044025956c /src/libcola/cola.cpp | |
| parent | CI/AppVeyor: Use dist-win targets and create installers on tag (diff) | |
| download | inkscape-b82b890314bfc64364f38e69696f7c6596ec3536.tar.gz inkscape-b82b890314bfc64364f38e69696f7c6596ec3536.zip | |
libcola: C++11 fixes for Trusty
Diffstat (limited to 'src/libcola/cola.cpp')
| -rw-r--r-- | src/libcola/cola.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcola/cola.cpp b/src/libcola/cola.cpp index d553110b9..0009ef894 100644 --- a/src/libcola/cola.cpp +++ b/src/libcola/cola.cpp @@ -126,7 +126,7 @@ ConstrainedMajorizationLayout Dij[i*n + j] = d; if(i==j) continue; double lij=0; - if(d!=0 && !isinf(d)) { + if(d!=0 && !std::isinf(d)) { lij=1./(d*d); } degree += lap2[i*n + j] = lij; @@ -284,7 +284,7 @@ inline double ConstrainedMajorizationLayout for (unsigned i = 1; i < n; i++) { for (unsigned j = 0; j < i; j++) { d = Dij[i*n+j]; - if(!isinf(d)&&d!=numeric_limits<double>::max()) { + if(!std::isinf(d)&&d!=numeric_limits<double>::max()) { diff = d - euclidean_distance(i,j); if(d>80&&diff<0) continue; sum += diff*diff / (d*d); |