]> git.mxchange.org Git - simgear.git/commitdiff
Fix VS2010 lack of fminf
authorStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Sun, 10 Aug 2014 11:54:58 +0000 (12:54 +0100)
committerStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Sun, 10 Aug 2014 11:54:58 +0000 (12:54 +0100)
simgear/scene/material/matlib.cxx

index 64f75ab205950ea80f5cb384af6209ed1b9c1e6e..848568d0f66b0dd3949160e179adf88eceebb3c5 100644 (file)
@@ -108,8 +108,8 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath,
                        float y1 = area_iter->get()->getFloatValue("lat1", -90.0f);
                        float y2 = area_iter->get()->getFloatValue("lat2", 90.0f);
                        SGRect<float> rect = SGRect<float>(
-                                       fminf(x1, x2),
-                                       fminf(y1, y2),
+                                       std::min<float>(x1, x2),
+                                       std::min<float>(y1, y2),
                                        fabs(x2 - x1),
                                        fabs(y2 - y1));
                        arealist->push_back(rect);