ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-2.0/src/visitors/AtomData.hpp
(Generate patch)

Comparing branches/new_design/OOPSE-2.0/src/visitors/AtomData.hpp (file contents):
Revision 1683, Thu Oct 28 22:34:02 2004 UTC vs.
Revision 1816 by tim, Wed Dec 1 19:10:51 2004 UTC

# Line 1 | Line 1
1   #ifndef VISITOR_ATOMDATA_HPP
2   #define VISITOR_ATOMDATA_HPP
3 + #include <string>
4 + #include <vector>
5   #include "utils/GenericData.hpp"
6  
5 – using namespace std;
6 –
7   namespace oopse {
8  
9   struct AtomInfo {
10    public:
11 <    string AtomType;
11 >    std::string AtomType;
12      double pos[3];
13      double dipole[3];  
14   };
# Line 17 | Line 17 | class AtomData : public GenericData{
17    public:
18      AtomData(const string& id = "ATOMDATA") : GenericData(id) {}
19      ~AtomData() {
20 <        vector<AtomInfo*>::iterator i;
20 >        std::vector<AtomInfo*>::iterator i;
21          AtomInfo* atomInfo;
22  
23          for(atomInfo = beginAtomInfo(i); atomInfo; atomInfo  = nextAtomInfo(i))
# Line 35 | Line 35 | class AtomData : public GenericData{
35        ++i;
36        return i != data.end()? *i: NULL;
37      }
38 <    vector<AtomInfo*> getData() {return data;}
38 >    std::vector<AtomInfo*> getData() {return data;}
39      int getSize() {return data.size();}
40    protected:
41 <    vector<AtomInfo*> data;
41 >    std::vector<AtomInfo*> data;
42   };
43  
44  

Diff Legend

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