[lmi-commits] [lmi] master ecd20b1 04/10: Improve Max() and Min() implementations

[Greg Chicares]

branch: master
commit ecd20b107ca7a462a43ffdab4fcbd0c5ae445390
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Improve Max() and Min() implementations
    
    libstdc++ thinks it important enough to write std::{max,min}() this
    way, and lmi shouldn't disagree without any clear reason.
    
    * tools/pete-2.1.1/PETE/Tools/PeteOps.in: Modified.
    * tools/pete-2.1.1/PETE/OperatorTags.h: Automatically regenerated.
    * tools/pete-2.1.1/PETE/Tools/PeteOps.cpp: Automatically regenerated.
---
 tools/pete-2.1.1/PETE/OperatorTags.h    | 4 ++--
 tools/pete-2.1.1/PETE/Tools/PeteOps.cpp | 4 ++--
 tools/pete-2.1.1/PETE/Tools/PeteOps.in  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/pete-2.1.1/PETE/OperatorTags.h 
b/tools/pete-2.1.1/PETE/OperatorTags.h
index ca2b276..799eca0 100644
--- a/tools/pete-2.1.1/PETE/OperatorTags.h
+++ b/tools/pete-2.1.1/PETE/OperatorTags.h
@@ -442,7 +442,7 @@ struct FnMax
   inline typename BinaryReturn<T1, T2, FnMax >::Type_t
   operator()(const T1 &a, const T2 &b) const
   {
-    return ((a < b) ? b : a);
+    if(a < b) return b; else return a;
   }
 };
 
@@ -453,7 +453,7 @@ struct FnMin
   inline typename BinaryReturn<T1, T2, FnMin >::Type_t
   operator()(const T1 &a, const T2 &b) const
   {
-    return ((a < b) ? a : b);
+    if(b < a) return b; else return a;
   }
 };
 
diff --git a/tools/pete-2.1.1/PETE/Tools/PeteOps.cpp 
b/tools/pete-2.1.1/PETE/Tools/PeteOps.cpp
index 9ba895c..eb50092 100644
--- a/tools/pete-2.1.1/PETE/Tools/PeteOps.cpp
+++ b/tools/pete-2.1.1/PETE/Tools/PeteOps.cpp
@@ -196,12 +196,12 @@ void peteOps(map<string,vector<OperatorDescriptor> > &m)
   m["binaryOps"].push_back(
               OperatorDescriptor("FnMax",
                                  "Max",
-                                 "return ((a < b) ? b : a);",
+                                 "if(a < b) return b; else return a;",
                                  ""));
   m["binaryOps"].push_back(
               OperatorDescriptor("FnMin",
                                  "Min",
-                                 "return ((a < b) ? a : b);",
+                                 "if(b < a) return b; else return a;",
                                  ""));
   m["binaryStdOps"].push_back(
               OperatorDescriptor("ApplyBinary",
diff --git a/tools/pete-2.1.1/PETE/Tools/PeteOps.in 
b/tools/pete-2.1.1/PETE/Tools/PeteOps.in
index b6d556f..bc52a4c 100644
--- a/tools/pete-2.1.1/PETE/Tools/PeteOps.in
+++ b/tools/pete-2.1.1/PETE/Tools/PeteOps.in
@@ -150,11 +150,11 @@ binaryOps
 -----
   TAG = "FnMax"
   FUNCTION = "Max"
-  EXPR = "return ((a < b) ? b : a);"
+  EXPR = "if(a < b) return b; else return a;"
 -----
   TAG = "FnMin"
   FUNCTION = "Min"
-  EXPR = "return ((a < b) ? a : b);"
+  EXPR = "if(b < a) return b; else return a;"
 
 binaryBoolOps
 -----