#2812 BBTK Bug New Normal Package std not compiling in windows fmin fmax missing...

diff --git a/packages/std/src/bbstdMathOperation.cxx b/packages/std/src/bbstdMathOperation.cxx
index a4b7272d6d25dcee9c5216cf9efa8fe5193b13ae..68db44335898fdcdad1de2400d74a83f4e7de2cd 100644 (file)
--- a/packages/std/src/bbstdMathOperation.cxx
+++ b/packages/std/src/bbstdMathOperation.cxx
@@ -11,6 +11,7 @@
 namespace bbstd
 {
 
+
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,MathOperation)
 BBTK_BLACK_BOX_IMPLEMENTATION(MathOperation,bbtk::AtomicBlackBox);
 //===== 
@@ -74,8 +75,8 @@ void MathOperation::Process()
     if (bbGetInputType()==13) bbSetOutputOut( acos( bbGetInputIn1() ) );
     if (bbGetInputType()==14) bbSetOutputOut( atan( bbGetInputIn1() ) );
     if (bbGetInputType()==15) bbSetOutputOut( atan2( bbGetInputIn1(),bbGetInputIn2() ) );
-    if (bbGetInputType()==16) bbSetOutputOut( fmin( bbGetInputIn1(),bbGetInputIn2() )  );
-    if (bbGetInputType()==17) bbSetOutputOut( fmax( bbGetInputIn1(),bbGetInputIn2() )  );
+    if (bbGetInputType()==16) bbSetOutputOut( std::min( bbGetInputIn1(),bbGetInputIn2() )  );
+    if (bbGetInputType()==17) bbSetOutputOut( std::max( bbGetInputIn1(),bbGetInputIn2() )  );
     if (bbGetInputType()==18) bbSetOutputOut( fabs( bbGetInputIn1() ) );
 }
 //===== 

diff --git a/packages/std/src/bbstdMathOperationVector.cxx b/packages/std/src/bbstdMathOperationVector.cxx
index 2fc5d4ebd832be976b5ac26f780693645c7593dc..cebb9673d4f8200d65e933651d3e96a30bd40078 100644 (file)
--- a/packages/std/src/bbstdMathOperationVector.cxx
+++ b/packages/std/src/bbstdMathOperationVector.cxx
@@ -5,7 +5,6 @@
 #include "bbstdPackage.h"
 
 #include <math.h>
-#include <stdlib.h>
 #include <time.h>
 
 namespace bbstd
@@ -50,7 +49,7 @@ void MathOperationVector::MinVector(std::vector<double> *v,std::vector<double> *
                tmpResult=(*v)[0];
                for (i=1;i<sizeVec;i++) 
                { 
-                       tmpResult = fmin ( (*v)[i] , tmpResult ) ; 
+                       tmpResult = std::min ( (*v)[i] , tmpResult ) ; 
                } // for i 
                vr->push_back( tmpResult ); 
        } // if sizeVec
@@ -67,7 +66,7 @@ void MathOperationVector::MaxVector(std::vector<double> *v,std::vector<double> *
                tmpResult=(*v)[0];
                for (i=1;i<sizeVec;i++) 
                { 
-                       tmpResult = fmax ( (*v)[i] , tmpResult ) ; 
+                       tmpResult = std::max ( (*v)[i] , tmpResult ) ; 
                } // for i 
                vr->push_back( tmpResult ); 
        } // if sizeVec
@@ -335,15 +334,15 @@ void MathOperationVector::Process()
        {
                for (i=0;i<sizeVec;i++)
                {
-                       minTmp = fmin(  g(v0,i,999999) , g(v1,i,999999) );
-                       minTmp = fmin(  g(v2,i,999999) , minTmp );
-                       minTmp = fmin(  g(v3,i,999999) , minTmp );
-                       minTmp = fmin(  g(v4,i,999999) , minTmp );
-                       minTmp = fmin(  g(v5,i,999999) , minTmp );
-                       minTmp = fmin(  g(v6,i,999999) , minTmp );
-                       minTmp = fmin(  g(v7,i,999999) , minTmp );
-                       minTmp = fmin(  g(v8,i,999999) , minTmp );
-                       minTmp = fmin(  g(v9,i,999999) , minTmp );
+                       minTmp = std::min(  g(v0,i,999999) , g(v1,i,999999) );
+                       minTmp = std::min(  g(v2,i,999999) , minTmp );
+                       minTmp = std::min(  g(v3,i,999999) , minTmp );
+                       minTmp = std::min(  g(v4,i,999999) , minTmp );
+                       minTmp = std::min(  g(v5,i,999999) , minTmp );
+                       minTmp = std::min(  g(v6,i,999999) , minTmp );
+                       minTmp = std::min(  g(v7,i,999999) , minTmp );
+                       minTmp = std::min(  g(v8,i,999999) , minTmp );
+                       minTmp = std::min(  g(v9,i,999999) , minTmp );
                        resultVec.push_back( minTmp );
                } // for i
                bbSetOutputOut( resultVec );
@@ -369,15 +368,15 @@ void MathOperationVector::Process()
        {
                for (i=0;i<sizeVec;i++)
                {
-                       maxTmp = fmax(  g(v0,i,-999999) , g(v1,i,-999999) );
-                       maxTmp = fmax(  g(v2,i,-999999) , maxTmp );
-                       maxTmp = fmax(  g(v3,i,-999999) , maxTmp );
-                       maxTmp = fmax(  g(v4,i,-999999) , maxTmp );
-                       maxTmp = fmax(  g(v5,i,-999999) , maxTmp );
-                       maxTmp = fmax(  g(v6,i,-999999) , maxTmp );
-                       maxTmp = fmax(  g(v7,i,-999999) , maxTmp );
-                       maxTmp = fmax(  g(v8,i,-999999) , maxTmp );
-                       maxTmp = fmax(  g(v9,i,-999999) , maxTmp );
+                       maxTmp = std::max(  g(v0,i,-999999) , g(v1,i,-999999) );
+                       maxTmp = std::max(  g(v2,i,-999999) , maxTmp );
+                       maxTmp = std::max(  g(v3,i,-999999) , maxTmp );
+                       maxTmp = std::max(  g(v4,i,-999999) , maxTmp );
+                       maxTmp = std::max(  g(v5,i,-999999) , maxTmp );
+                       maxTmp = std::max(  g(v6,i,-999999) , maxTmp );
+                       maxTmp = std::max(  g(v7,i,-999999) , maxTmp );
+                       maxTmp = std::max(  g(v8,i,-999999) , maxTmp );
+                       maxTmp = std::max(  g(v9,i,-999999) , maxTmp );
                        resultVec.push_back(  maxTmp  );
                } // for i
                bbSetOutputOut( resultVec );