Changeset 198

Show
Ignore:
Timestamp:
10/14/06 13:35:55 (2 years ago)
Author:
ug
Message:

Another small bugfix and a Borland compatibility issue.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 06/libkombilo/search.cc

    r197 r198  
    813813 
    814814Algo_signature::Algo_signature(int bsize) : Algorithm(bsize) { 
    815   datasig = 0; 
    816815  main_variation = true; 
    817816} 
    818817 
    819818Algo_signature::~Algo_signature() { 
    820   if (datasig) delete datasig; 
    821819} 
    822820 
    …… 
    827825  int rc = sqlite3_exec(db, sql, 0, 0, 0); 
    828826  if (rc != SQLITE_OK) throw DBError(); 
    829   // datasig = new vector<char* >; 
    830827} 
    831828 
    …… 
    24332430  if (argc==3 && argv[0] && argv[1] && argv[2]) { 
    24342431    // printf("found %s, %lld", argv[2], atoi(argv[2])); 
     2432#ifdef __BORLANDC__ 
     2433    ((vector<HashhitCS* >*)results)->push_back(new HashhitCS(atoi(argv[0]), atoi(argv[1]), _atoi64(argv[2])!=hashCode)); 
     2434#else 
    24352435    ((vector<HashhitCS* >*)results)->push_back(new HashhitCS(atoi(argv[0]), atoi(argv[1]), atoll(argv[2])!=hashCode)); 
     2436#endif 
    24362437  } else throw DBError(); 
    24372438  return 0; 
    …… 
    33453346    else { 
    33463347      // printf("use p_options\n"); 
    3347       p_op = new ProcessOptions(*p_op); 
     3348      p_op = new ProcessOptions(*p_options); 
    33483349      p_op->validate(); // make sure the most important information is contained in rootNodeTags list 
    33493350    } 

  • 06/libkombilo/search.h

    r197 r198  
    222222    int counter; 
    223223    char* signature; 
    224     std::vector<char* > *datasig; 
    225224  private: 
    226225    bool main_variation;