zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug986016 into lp:zorba.

Requested reviews:
  Cezar Andrei (cezar-andrei)
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #986016 in Zorba: "Windows trunk not compiling"
  https://bugs.launchpad.net/zorba/+bug/986016

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug986016/+merge/102792

Workaround Windows compiler error
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug986016/+merge/102792
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/util/stl_util.h'
--- src/util/stl_util.h	2012-04-19 21:40:27 +0000
+++ src/util/stl_util.h	2012-04-20 05:20:24 +0000
@@ -309,21 +309,21 @@
 
 template<typename N1,typename N2> inline
 typename std::enable_if<ZORBA_TR1_NS::is_signed<N1>::value
-                     && ZORBA_TR1_NS::is_unsigned<N2>::value,bool>::type
+                     && !!ZORBA_TR1_NS::is_unsigned<N2>::value,bool>::type
 ge_min( N1 n1, N2 ) {
   return n1 >= 0;
 }
 
 template<typename N1,typename N2> inline
-typename std::enable_if<ZORBA_TR1_NS::is_unsigned<N1>::value
+typename std::enable_if<!!ZORBA_TR1_NS::is_unsigned<N1>::value
                      && ZORBA_TR1_NS::is_signed<N2>::value,bool>::type
 ge_min( N1, N2 ) {
   return true;
 }
 
 template<typename N1,typename N2> inline
-typename std::enable_if<ZORBA_TR1_NS::is_unsigned<N1>::value
-                     && ZORBA_TR1_NS::is_unsigned<N2>::value,bool>::type
+typename std::enable_if<!!ZORBA_TR1_NS::is_unsigned<N1>::value
+                     && !!ZORBA_TR1_NS::is_unsigned<N2>::value,bool>::type
 ge_min( N1, N2 ) {
   return true;
 }
@@ -337,21 +337,21 @@
 
 template<typename N1,typename N2> inline
 typename std::enable_if<ZORBA_TR1_NS::is_signed<N1>::value
-                     && ZORBA_TR1_NS::is_unsigned<N2>::value,bool>::type
+                     && !!ZORBA_TR1_NS::is_unsigned<N2>::value,bool>::type
 le_max( N1 n1, N2 ) {
   return n1 <= 0 || static_cast<N2>( n1 ) <= std::numeric_limits<N2>::max();
 }
 
 template<typename N1,typename N2> inline
-typename std::enable_if<ZORBA_TR1_NS::is_unsigned<N1>::value
+typename std::enable_if<!!ZORBA_TR1_NS::is_unsigned<N1>::value
                      && ZORBA_TR1_NS::is_signed<N2>::value,bool>::type
 le_max( N1 n1, N2 ) {
   return n1 <= static_cast<N1>( std::numeric_limits<N2>::max() );
 }
 
 template<typename N1,typename N2> inline
-typename std::enable_if<ZORBA_TR1_NS::is_unsigned<N1>::value
-                     && ZORBA_TR1_NS::is_unsigned<N2>::value,bool>::type
+typename std::enable_if<!!ZORBA_TR1_NS::is_unsigned<N1>::value
+                     && !!ZORBA_TR1_NS::is_unsigned<N2>::value,bool>::type
 le_max( N1 n1, N2 ) {
   return n1 <= std::numeric_limits<N2>::max();
 }