Changeset 176

Show
Ignore:
Timestamp:
08/05/08 09:41:46 (4 months ago)
Author:
zork
Message:

fixes for borland compiler

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/dba/dba/storeable.h

    r163 r176  
    238238*/ 
    239239#define BIND_STR(member,filter_class,field) \ 
    240   new dba::StoreTableMember(st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::STRING); 
     240  new dba::StoreTableMember(st_table,field,&reinterpret_cast<char &>(member) - (char*)this,new filter_class(member),dba::Database::STRING); 
    241241 
    242242/** 
     
    248248*/ 
    249249#define BIND_INT(member,filter_class,field) \ 
    250   new dba::StoreTableMember(st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::INTEGER); 
     250  new dba::StoreTableMember(st_table,field,&reinterpret_cast<char &>(member) - (char*)this,new filter_class(member),dba::Database::INTEGER); 
    251251 
    252252/** 
     
    258258*/ 
    259259#define BIND_FLT(member,filter_class,field) \ 
    260   new dba::StoreTableMember(st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::FLOAT); 
     260  new dba::StoreTableMember(st_table,field,&reinterpret_cast<char &>(member) - (char*)this,new filter_class(member),dba::Database::FLOAT); 
    261261 
    262262/** 
     
    268268*/ 
    269269#define BIND_DAT(member,filter_class,field) \ 
    270   new dba::StoreTableMember(st_table,field,(char*)&(member) - (char*)this,new filter_class(member),dba::Database::DATE); 
     270  new dba::StoreTableMember(st_table,field,&reinterpret_cast<char &>(member) - (char*)this,new filter_class(member),dba::Database::DATE); 
    271271 
    272272/** 
     
    279279*/ 
    280280#define BIND_COL(member,filter_class,fkname) \ 
    281   new dba::ColMemberEntry(st_ColTable,NULL,(char*)&(member) - (char*)this,new filter_class(member),fkname); 
     281  new dba::ColMemberEntry(st_ColTable,NULL,&reinterpret_cast<char &>(member) - (char*)this,new filter_class(member),fkname); 
    282282 
    283283/** 
     
    294294*/ 
    295295#define BIND_CLA(member,filter_class,fkname,coll_id,table_name) \ 
    296   new dba::ColMemberEntry(st_ColTable,NULL,(char*)&(member) - (char*)this,new filter_class(member),fkname,table_name,coll_id); 
     296  new dba::ColMemberEntry(st_ColTable,NULL,&reinterpret_cast<char &>(member) - (char*)this,new filter_class(member),fkname,table_name,coll_id); 
    297297 
    298298/** 
  • trunk/dba/test/main.cpp

    r175 r176  
    144144  CppUnit::BriefTestProgressListener listener; 
    145145  runner.eventManager().addListener(&listener); 
    146   //runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); 
     146  runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); 
    147147  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::sqlError)); 
    148148  //runner.addTest(new CppUnit::TestCaller<PostgresSQLArchiveTestCase>("debug_test",&PostgresSQLArchiveTestCase::sqlError)); 
     
    150150  //runner.addTest(new CppUnit::TestCaller<dba_tests::CSVTestCase>("debug_test",&dba_tests::CSVTestCase::invalidPos)); 
    151151  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback)); 
    152   runner.addTest(dba_tests::XMLTestCase::suite()); 
     152  //runner.addTest(dba_tests::XMLTestCase::suite()); 
    153153  //runner.addTest(new CppUnit::TestCaller<dba_tests::XMLTestCase>("debug_test",&dba_tests::XMLTestCase::storeBug2)); 
    154154  //runner.addTest(new CppUnit::TestCaller<dba_tests::XMLTestCase>("debug_test",&dba_tests::XMLTestCase::store_two));