Changeset 8270

Show
Ignore:
Timestamp:
30/11/11 14:20:50 (6 months ago)
Author:
westram
Message:
  • fix conversion-null warnings
Location:
trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/ARBDB/adGene.cxx

    r7814 r8270  
    952952 
    953953        pos->stop_pos[2] = 26; 
    954         TEST_WRITE_GEN_POSITION_ERROR(pos, NULL); 
     954        TEST_WRITE_GEN_POSITION_ERROR(pos, (void*)NULL); 
    955955         
    956956        pos->stop_pos[0] = 100; 

  • trunk/ARBDB/adfile.cxx

    r8256 r8270  
    701701void TEST_find_file() { 
    702702    TEST_ASSERT_EQUAL(GB_existing_file("min_ascii.arb", false), "min_ascii.arb"); 
    703     TEST_ASSERT_EQUAL(GB_existing_file("nosuchfile", false), NULL); 
     703    TEST_ASSERT_NULL(GB_existing_file("nosuchfile", false)); 
    704704     
    705705    char *tcporg = GB_lib_file(false, "", "arb_tcp_org.dat"); 
    706706    TEST_ASSERT_EQUAL(tcporg, GB_path_in_ARBHOME("lib/arb_tcp_org.dat")); 
    707     TEST_ASSERT_EQUAL(GB_lib_file(true, "bla", "blub"), NULL); 
     707    TEST_ASSERT_NULL(GB_lib_file(true, "bla", "blub")); 
    708708    free(tcporg); 
    709709 
    710710    char *status = GB_property_file(false, "status.arb"); 
    711711    TEST_ASSERT_EQUAL(status, GB_path_in_ARBHOME("lib/arb_default/status.arb")); 
    712     TEST_ASSERT_EQUAL(GB_property_file(true, "undhepp"), NULL); 
     712    TEST_ASSERT_NULL(GB_property_file(true, "undhepp")); 
    713713    free(status); 
    714714} 

  • trunk/CORE/arb_string.cxx

    r8220 r8270  
    248248 
    249249        char *null = NULL; 
    250         TEST_ASSERT_NULL(NULL); 
     250        TEST_ASSERT_NULL((void*)NULL); 
    251251        TEST_ASSERT_NULL(null); 
    252252 

  • trunk/UNIT_TESTER/test_unit.h

    r8220 r8270  
    11441144 
    11451145 
    1146 #define TEST_ASSERT_NORESULT__ERROREXPORTED(create_result) TEST_ASSERT_NORESULT__ERROREXPORTED_CHECKERROR(create_result,NULL,NULL)  
     1146#define TEST_ASSERT_NORESULT__ERROREXPORTED(create_result) TEST_ASSERT_NORESULT__ERROREXPORTED_CHECKERROR(create_result,(void*)NULL,(void*)NULL)  
    11471147     
    11481148 
    … …  
    12041204#define TEST_ASSERT_EQUAL__BROKEN(e1,t2) TEST_EXPECT__BROKEN(that(e1).equals(t2)) 
    12051205 
    1206 #define TEST_ASSERT_NULL(n)         TEST_ASSERT_EQUAL(n, NULL) 
    1207 #define TEST_ASSERT_NULL__BROKEN(n) TEST_ASSERT_EQUAL__BROKEN(n, NULL) 
     1206#define TEST_ASSERT_NULL(n)         TEST_ASSERT_EQUAL(n, (typeof(n))NULL) 
     1207#define TEST_ASSERT_NULL__BROKEN(n) TEST_ASSERT_EQUAL__BROKEN(n, (typeof(n))NULL) 
    12081208 
    12091209#define TEST_ASSERT_SIMILAR(e1,t2,epsilon)         TEST_EXPECT(that(e1).is(epsilon_similar(epsilon), t2))