--- branches/new_design/OOPSE-3.0/src/UseTheForce/Shapes_FF.cpp	2004/12/02 04:55:10	1825
+++ branches/new_design/OOPSE-3.0/src/UseTheForce/Shapes_FF.cpp	2004/12/02 05:04:20	1826
@@ -87,22 +87,22 @@ void Shapes_FF::readParams( void ){
   DirectionalAtomType* dat;
   ShapeAtomType* st;
 
-  map<string, AtomType*>::iterator iter;
+   std::map<string, AtomType*>::iterator iter;
 
   // vectors for shape transfer to fortran
-  vector<RealSphericalHarmonic*> tempSHVector;
-  vector<int> contactL;
-  vector<int> contactM;
-  vector<int> contactFunc;
-  vector<double> contactCoeff;
-  vector<int> rangeL;
-  vector<int> rangeM;
-  vector<int> rangeFunc;
-  vector<double> rangeCoeff;
-  vector<int> strengthL;
-  vector<int> strengthM;
-  vector<int> strengthFunc;
-  vector<double> strengthCoeff;
+   std::vector<RealSphericalHarmonic*> tempSHVector;
+   std::vector<int> contactL;
+   std::vector<int> contactM;
+   std::vector<int> contactFunc;
+   std::vector<double> contactCoeff;
+   std::vector<int> rangeL;
+   std::vector<int> rangeM;
+   std::vector<int> rangeFunc;
+   std::vector<double> rangeCoeff;
+   std::vector<int> strengthL;
+   std::vector<int> strengthM;
+   std::vector<int> strengthFunc;
+   std::vector<double> strengthCoeff;
    
   // generate the force file name   
   fileName = "Shapes.frc";
@@ -291,7 +291,7 @@ void Shapes_FF::initializeAtoms( int nAtoms, Atom** th
 void Shapes_FF::initializeAtoms( int nAtoms, Atom** the_atoms ){
   
   int i,j,k;
-  map<string, AtomType*>::iterator iter;
+   std::map<string, AtomType*>::iterator iter;
 
   // initialize the atoms
   DirectionalAtom* dAtom;
@@ -400,7 +400,7 @@ void Shapes_FF::parseShapeFile(string shapeFileName, S
   int nTokens;
   Mat3x3d momInert;
   RealSphericalHarmonic* rsh;
-  vector<RealSphericalHarmonic*> functionVector;
+   std::vector<RealSphericalHarmonic*> functionVector;
   ifstrstream shapeFile;
    std::stringtempString;