ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-4/src/UseTheForce/LJFF.cpp
(Generate patch)

Comparing branches/new_design/OOPSE-4/src/UseTheForce/LJFF.cpp (file contents):
Revision 1683, Thu Oct 28 22:34:02 2004 UTC vs.
Revision 1702 by tim, Wed Nov 3 18:00:36 2004 UTC

# Line 52 | Line 52 | namespace LJ_NS{
52      }
53      ~LinkedAtomType(){ if( next != NULL ) delete next; }
54  
55 <    LinkedAtomType* find(char* key){
55 >    LinkedAtomType* find(const char* key){
56        if( !strcmp(name, key) ) return this;
57        if( next != NULL ) return next->find(key);
58        return NULL;
# Line 396 | Line 396 | void LJFF::initializeAtoms( int nAtoms, Atom** the_ato
396  
397    for( i=0; i<nAtoms; i++ ){
398      
399 <    currentAtomType = headAtomType->find( the_atoms[i]->getType() );
399 >    currentAtomType = headAtomType->find(the_atoms[i]->getType().c_str() );
400      if( currentAtomType == NULL ){
401        sprintf( painCave.errMsg,
402                 "AtomType error, %s not found in force file.\n",
403 <               the_atoms[i]->getType() );
403 >               the_atoms[i]->getType().c_str() );
404        painCave.isFatal = 1;
405        simError();
406      }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines