diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-03 15:51:34 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-03 15:51:34 +0100 |
| commit | c7fed98b9ddef32b7c17d6022435b5bf8c4fa3f5 (patch) | |
| tree | 3ae3947ff14a14208f6ece4e635f0b5641c8c9d3 /dep/g3dlite/source/g3dmath.cpp | |
| parent | ffe8c75f17aa4c4059771265dd408055cb3c4e52 (diff) | |
| parent | 0db5573d4de436cf14c9f6d113a28800fa278c2c (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
dep/PackageList.txt
Diffstat (limited to 'dep/g3dlite/source/g3dmath.cpp')
| -rw-r--r-- | dep/g3dlite/source/g3dmath.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dep/g3dlite/source/g3dmath.cpp b/dep/g3dlite/source/g3dmath.cpp index e846f8c6080..84e8345bff4 100644 --- a/dep/g3dlite/source/g3dmath.cpp +++ b/dep/g3dlite/source/g3dmath.cpp @@ -41,7 +41,7 @@ double inf() { } bool isNaN(float x) { - static const float n = fnan(); + static const float n = nan(); return memcmp(&x, &n, sizeof(float)) == 0; } |