Changeset 37491

Show
Ignore:
Timestamp:
05/13/10 19:02:26 (3 years ago)
Author:
saturday06
Message:

k ... z .. n .

Location:
lang/objective-cplusplus/i3/trunk/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • lang/objective-cplusplus/i3/trunk/src/mil/src/test/Atomic.cc

    r37304 r37491  
    4444template <class T> 
    4545void test2() { 
     46#if defined(HAVE_GCC_ATOMIC_OPERATIONS) || defined(MIL_OS_WINDOWS) 
    4647    struct abcde { 
    4748        abcde(T data) { 
    … …  
    7980    bar.val.store((T)0); 
    8081    QT_CHECK_EQUAL(memcmp(&foo, &bar, sizeof(foo)), 0); 
     82#endif 
    8183} 
    8284 

  • lang/objective-cplusplus/i3/trunk/src/tests/TestNLS.cc

    r37392 r37491  
    184184    check_translation("Hello, world!", _T("Hello, world!")); 
    185185 
    186     QT_CHECK_NOT_EQUAL(set_locale("ja" JA_ENCODING), -1); 
     186    QT_CHECK_NOT_EQUAL(set_locale("ja_JP" JA_ENCODING), -1); 
    187187    check_translation("Hello, world!", hello_world_ja); 
    188188 
    … …  
    196196    check_translation("Hello, world!", _T("Sveika, pasaule!")); 
    197197 
    198     QT_CHECK_NOT_EQUAL(set_locale("ja" JA_ENCODING), -1); 
     198    QT_CHECK_NOT_EQUAL(set_locale("ja_JP" JA_ENCODING), -1); 
    199199    check_translation("Hello, world!", hello_world_ja); 
    200200