--- branches/new_design/OOPSE-4/src/types/ShapeAtomType.hpp 2004/12/02 04:55:10 1825 +++ branches/new_design/OOPSE-4/src/types/ShapeAtomType.hpp 2004/12/02 05:04:20 1826 @@ -23,9 +23,9 @@ namespace oopse { ShapeAtomType() : DirectionalAtomType() { atp.is_Shape = 1; } ~ShapeAtomType(); - vector getContactFuncs(void) {return contactFuncs;} - vector getRangeFuncs(void) {return rangeFuncs;} - vector getStrengthFuncs(void) {return strengthFuncs;} + std::vector getContactFuncs(void) {return contactFuncs;} + std::vector getRangeFuncs(void) {return rangeFuncs;} + std::vector getStrengthFuncs(void) {return strengthFuncs;} void setContactFuncs(vector cf) { contactFuncs = cf; @@ -60,9 +60,9 @@ namespace oopse { private: - vector contactFuncs; // The contact functions - vector rangeFuncs; // The range functions - vector strengthFuncs; // The strength functions + std::vector contactFuncs; // The contact functions + std::vector rangeFuncs; // The range functions + std::vector strengthFuncs; // The strength functions }; }