r21382 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sat Jun 18 12:49:45 UTC 2016


Author: jghali
Date: Sat Jun 18 12:49:45 2016
New Revision: 21382

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21382
Log:
fix build issue when not compiling with c++11 : std::isinf is c++11 only

Modified:
    trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc

Modified: trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21382&path=/trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc
==============================================================================
--- trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc	(original)
+++ trunk/Scribus/scribus/third_party/fparser/fpoptimizer.cc	Sat Jun 18 12:49:45 2016
@@ -7296,7 +7296,11 @@
                             //if(imm >= 0.0)
                             {
                                 double new_base_immed = std::pow(base_immed, imm);
+#if __cplusplus < 201103L
+								if(isinf(new_base_immed) || new_base_immed == 0.0)
+#else
 								if(std::isinf(new_base_immed) || new_base_immed == 0.0)
+#endif
                                 {
                                     // It produced an infinity. Do not change.
                                     break;




More information about the scribus-commit mailing list