Changeset 2077 for branches/newmole

Show
Ignore:
Timestamp:
05/16/08 16:34:31 (8 months ago)
Author:
rjrw
Message:

Attempt to deal with most VS warnings.

Location:
branches/newmole/source
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/newmole/source/mole_priv.h

    r2076 r2077  
    88 
    99extern struct mole_priv_s { 
    10         map <string,struct molecule *> spectab; 
     10        map <string,molecule *> spectab; 
    1111        map <string,struct mole_reaction_s *> reactab; 
    1212        map <string,struct chem_element_s *> elemtab; 
    … …  
    2424 
    2525typedef map<string,struct mole_reaction_s *>::iterator mole_reaction_i; 
    26 typedef map<string,struct molecule *>::iterator molecule_i; 
     26typedef map<string,molecule *>::iterator molecule_i; 
    2727typedef map<string,struct chem_element_s *>::iterator chem_element_i; 
    2828 
    29 extern struct molecule **groupspecies; 
     29extern molecule **groupspecies; 
    3030 
    31 extern struct molecule *null_mole; 
     31extern molecule *null_mole; 
    3232 
    3333#define MAXREACTANTS 3 
    … …  
    3838        char *label; 
    3939        int nreactants, nproducts, photon; 
    40         struct molecule *reactants[MAXREACTANTS]; 
    41         struct molecule *rvector[MAXREACTANTS]; 
    42         struct molecule *products[MAXPRODUCTS]; 
    43         struct molecule *pvector[MAXPRODUCTS]; 
     40        molecule *reactants[MAXREACTANTS]; 
     41        molecule *rvector[MAXREACTANTS]; 
     42        molecule *products[MAXPRODUCTS]; 
     43        molecule *pvector[MAXPRODUCTS]; 
    4444        double rk, reduced_mass, a, b, c; 
    4545        double (*fun)(struct mole_reaction_s *rate); 

  • branches/newmole/source/mole_species.cpp

    r2043 r2077  
    3535 
    3636STATIC void newelement(const char label[], int ipion); 
    37 STATIC struct molecule *newspecies(const char label[7], enum spectype type,  
     37STATIC molecule *newspecies(const char label[7], enum spectype type,  
    3838                                                                                                                                         enum mole_state state, realnum *location,  
    3939                                                                                                                                         realnum form_enthalpy); 
    4040STATIC struct chem_element_s *findelement(const char buf[]); 
    41 STATIC bool isactive(struct molecule *p); 
    42 STATIC bool ispassive(struct molecule *p); 
     41STATIC bool isactive(molecule *p); 
     42STATIC bool ispassive(molecule *p); 
    4343STATIC void make_groups(void); 
    4444 
    4545struct mole_priv_s mole_priv; 
    46 struct molecule *null_mole; 
     46molecule *null_mole; 
    4747struct chem_element_s *element_list[LIMELM]; 
    48 struct molecule **groupspecies; 
     48molecule **groupspecies; 
    4949 
    5050#include <functional>