[sipify] Replace std::numeric_limits with old style DBL_MAX/etc

qgis · Jun 16, 2018 · a4c8386 · a4c8386
1 parent 47e7a10
commit a4c8386
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/python/core/auto_generated/processing/qgsprocessingparameters.sip.in b/python/core/auto_generated/processing/qgsprocessingparameters.sip.in
@@ -1264,8 +1264,8 @@ to determine what units the distance values are in.
         const QVariant &defaultValue = QVariant(),
         const QString &parentParameterName = QString(),
         bool optional = false,
-        double minValue = std::numeric_limits<double>::lowest() + 1,
-        double maxValue = std::numeric_limits<double>::max() );
+        double minValue = -DBL_MAX + 1,
+        double maxValue = DBL_MAX );
 %Docstring
 Constructor for QgsProcessingParameterDistance.
 %End

diff --git a/python/core/auto_generated/qgis.sip.in b/python/core/auto_generated/qgis.sip.in
@@ -100,7 +100,7 @@ Returns a string representation of a double
 :param precision: number of decimal places to retain
 %End
 
-bool qgsDoubleNear( double a, double b, double epsilon = 4 * std::numeric_limits<double>::epsilon() );
+bool qgsDoubleNear( double a, double b, double epsilon = 4 * DBL_EPSILON );
 %Docstring
 Compare two doubles (but allow some difference)
 

diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -432,6 +432,14 @@ sub fix_annotations {
     return $line;
 }
 
+sub fix_constants {
+    my $line = $_[0];
+    $line =~ s/\bstd::numeric_limits<double>::max\(\)/DBL_MAX/;
+    $line =~ s/\bstd::numeric_limits<double>::lowest\(\)/-DBL_MAX/;
+    $line =~ s/\bstd::numeric_limits<double>::epsilon\(\)/DBL_EPSILON/;
+    return $line;
+}
+
 # detect a comment block, return 1 if found
 # if STRICT comment block shall begin at beginning of line (no code in front)
 sub detect_comment_block{
@@ -1087,6 +1095,7 @@ sub detect_non_method_member{
         $IS_OVERRIDE = 0;
     }
 
+    $LINE = fix_constants($LINE);
     $LINE = fix_annotations($LINE);
 
     # fix astyle placing space after % character