← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/windows-fixes into lp:zorba

 

Juan Zacarias has proposed merging lp:~zorba-coders/zorba/windows-fixes into lp:zorba.

Commit message:
Fixes for Windows.

Requested reviews:
  Juan Zacarias (juan457)
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/windows-fixes/+merge/168194

Fixes for Windows.
-- 
https://code.launchpad.net/~zorba-coders/zorba/windows-fixes/+merge/168194
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/zorbatypes/decimal.h'
--- src/zorbatypes/decimal.h	2013-05-16 19:05:52 +0000
+++ src/zorbatypes/decimal.h	2013-06-07 21:27:00 +0000
@@ -408,7 +408,7 @@
   return value_.sign();
 }
 
-inline Decimal::operator explicit_bool::type() const {
+inline Decimal::operator internal::ztd::explicit_bool::type() const {
   return explicit_bool::value_of( sign() );
 }
 

=== modified file 'src/zorbatypes/integer.h'
--- src/zorbatypes/integer.h	2013-05-20 20:29:45 +0000
+++ src/zorbatypes/integer.h	2013-06-07 21:27:00 +0000
@@ -1215,7 +1215,7 @@
 #endif /* ZORBA_WITH_BIG_INTEGER */
 
 template<class T>
-inline IntegerImpl<T>::operator explicit_bool::type() const {
+inline IntegerImpl<T>::operator internal::ztd::explicit_bool::type() const {
   return explicit_bool::value_of( sign() );
 }
 

=== modified file 'src/zorbatypes/timezone.h'
--- src/zorbatypes/timezone.h	2013-05-22 16:12:01 +0000
+++ src/zorbatypes/timezone.h	2013-06-07 21:27:00 +0000
@@ -131,7 +131,7 @@
   return gmtoff_;
 }
 
-inline TimeZone::operator explicit_bool::type() const {
+inline TimeZone::operator internal::ztd::explicit_bool::type() const {
   return explicit_bool::value_of( !timezone_not_set_ );
 }
 


Follow ups