--- branches/new_design/OOPSE-2.0/src/applications/simpleBuilder/Lattice.hpp	2004/12/02 04:55:10	1825
+++ branches/new_design/OOPSE-2.0/src/applications/simpleBuilder/Lattice.hpp	2004/12/02 05:14:58	1829
@@ -5,10 +5,10 @@ const  std::stringFCCLatticeType = "FCC";
 #include <vector>
 
 
-const  std::stringFCCLatticeType = "FCC";
-const  std::stringBCCLatticeType = "BCC";
-const  std::stringHCPCLatticeType = "HCP";
-const  std::stringOrthorhombicLatticeType = "ORTHORHOMBIC";
+const  std::string FCCLatticeType = "FCC";
+const  std::string BCCLatticeType = "BCC";
+const  std::string HCPCLatticeType = "HCP";
+const  std::string OrthorhombicLatticeType = "ORTHORHOMBIC";
 
 
 class CubicLattice : public BaseLattice{
@@ -16,10 +16,10 @@ class CubicLattice : public BaseLattice{
     CubicLattice();
   public:
     //get lattice constant of unit cell
-    virtual vector<double> getLatticeConstant();
+    virtual  std::vector<double> getLatticeConstant();
 
     //set lattice constant of unit cell
-    virtual void setLatticeConstant(const vector<double>& lc);
+    virtual void setLatticeConstant(const  std::vector<double>& lc);
   protected:
     double latticeParam;
 };
@@ -28,7 +28,7 @@ class FCCLattice : public CubicLattice{
 class FCCLattice : public CubicLattice{
   public:
     FCCLattice();
-    virtual const  std::stringgetLatticeType() {return FCCLatticeType;}    
+    virtual const  std::string getLatticeType() {return FCCLatticeType;}    
     virtual void update();
     
 };
@@ -37,20 +37,20 @@ class BCCLattice : public CubicLattice{
 class BCCLattice : public CubicLattice{
   public:
     BCCLattice();
-    virtual const  std::stringgetLatticeType() {return BCCLatticeType;}
+    virtual const  std::string getLatticeType() {return BCCLatticeType;}
 };
 
 
 class HCPLattice : public BaseLattice{
   public:
     HCPLattice();
-    virtual const  std::stringgetLatticeType() {return HCPCLatticeType;}
+    virtual const  std::string getLatticeType() {return HCPCLatticeType;}
 };
 
 class OrthorhombicLattice : public BaseLattice{
   public:
     OrthorhombicLattice();
-    virtual const  std::stringgetLatticeType() {return OrthorhombicLatticeType;}
+    virtual const  std::string getLatticeType() {return OrthorhombicLatticeType;}
 };
 */