Merge lp:~zorba-coders/zorba/bug1102537 into lp:zorba

[Rodolfo Ochoa]

Fix for windows compilation

Fix for windows compilation

[Rodolfo Ochoa (rodolfo-ochoa)]

review: Approve

[Juan Zacarias (juan457)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1102537-2013-01-22T02-08-08.222Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1102537 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug1102537-2013-01-22T02-08-08.222Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1102537-2013-01-22T02-48-43.131Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1102537 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug1102537-2013-01-22T02-48-43.131Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1102537-2013-01-22T03-32-08.259Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1102537 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug1102537-2013-01-22T03-32-08.259Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1102537-2013-01-22T07-26-06.744Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1102537-2013-01-22T07-26-06.744Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/zorbautils/locale.cpp'
--- src/zorbautils/locale.cpp	2013-01-17 23:58:37 +0000
+++ src/zorbautils/locale.cpp	2013-01-21 18:27:23 +0000
@@ -191,7 +191,7 @@
  * call it directly since we might be running on Windows XP.  Hence, check to
  * see if it's available and call it indirectly if so.
  */
-static BOOL Zorba_IsValidLocaleName( LPCWSTR lpLocaleName ) {
+static bool Zorba_IsValidLocaleName( LPCWSTR lpLocaleName ) {
   typedef int (WINAPI *IsValidLocaleName_type)( LPCWSTR );
 
   static IsValidLocaleName_type IsValidLocaleName_ptr;
@@ -204,7 +204,7 @@
     init = true;
   }
 
-  return IsValidLocaleName_ptr ? IsValidLocaleName_ptr( lpLocaleName ) : 0;
+  return IsValidLocaleName_ptr ? IsValidLocaleName_ptr( lpLocaleName )!=0 : false;
 }
 
 #else /* WIN32 */
@@ -1303,7 +1303,7 @@
 bool is_supported( iso639_1::type lang, iso3166_1::type country ) {
 #ifdef WIN32
   unique_ptr<WCHAR[]> const wlocale_name( get_wlocale_name( lang, country ) );
-  return !!::Zorba_IsValidLocaleName( wlocale_name.get() );
+  return Zorba_IsValidLocaleName( wlocale_name.get() );
 #else
   if ( locale_t const loc = get_unix_locale_t( lang, country ) ) {
     ::freelocale( loc );