--- trunk/OOPSE-2.0/src/visitors/CompositeVisitor.cpp	2004/10/21 16:22:01	1625
+++ trunk/OOPSE-2.0/src/visitors/CompositeVisitor.cpp	2005/01/12 22:41:40	1930
@@ -1,3 +1,44 @@
+ /*
+ * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
+ *
+ * The University of Notre Dame grants you ("Licensee") a
+ * non-exclusive, royalty free, license to use, modify and
+ * redistribute this software in source and binary code form, provided
+ * that the following conditions are met:
+ *
+ * 1. Acknowledgement of the program authors must be made in any
+ *    publication of scientific results based in part on use of the
+ *    program.  An acceptable form of acknowledgement is citation of
+ *    the article in which the program was described (Matthew
+ *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
+ *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
+ *    Parallel Simulation Engine for Molecular Dynamics,"
+ *    J. Comput. Chem. 26, pp. 252-271 (2005))
+ *
+ * 2. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 3. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * This software is provided "AS IS," without a warranty of any
+ * kind. All express or implied conditions, representations and
+ * warranties, including any implied warranty of merchantability,
+ * fitness for a particular purpose or non-infringement, are hereby
+ * excluded.  The University of Notre Dame and its licensors shall not
+ * be liable for any damages suffered by licensee as a result of
+ * using, modifying or distributing the software or its
+ * derivatives. In no event will the University of Notre Dame or its
+ * licensors be liable for any lost revenue, profit or data, or for
+ * direct, indirect, special, consequential, incidental or punitive
+ * damages, however caused and regardless of the theory of liability,
+ * arising out of the use of or inability to use software, even if the
+ * University of Notre Dame has been advised of the possibility of
+ * such damages.
+ */
+ 
 #include <cstring>
 #include "visitors/CompositeVisitor.hpp"
 #include "primitives/RigidBody.hpp"
@@ -23,12 +64,12 @@ void CompositeVisitor::addVisitor(BaseVisitor* newVisi
     curPriority = (*i).second;
     //if new visitor has higher priority, just insert it before current visitor
     if(priority > curPriority){      
-      visitorList.insert(i, make_pair(newVisitor, priority));
+      visitorList.insert(i, std::make_pair(newVisitor, priority));
     }
   }
 
   //if new visitor has lowest priority, insert it at the end of the list
-  visitorList.insert(visitorList.end(), make_pair(newVisitor, priority));
+  visitorList.insert(visitorList.end(), std::make_pair(newVisitor, priority));
 }
 
 BaseVisitor* CompositeVisitor::beginVisitor(VisitorIterator& i){
@@ -60,8 +101,8 @@ void CompositeVisitor::visit(RigidBody* rb){
 void CompositeVisitor::visit(RigidBody* rb){
   VisitorIterator i;
   BaseVisitor* curVisitor;
-  vector<Atom*> myAtoms;
-  vector<Atom*>::iterator atomIter;
+   std::vector<Atom*> myAtoms;
+   std::vector<Atom*>::iterator atomIter;
 
   myAtoms = rb->getAtoms();
   
@@ -76,9 +117,9 @@ const string CompositeVisitor::toString(){
   
 }
 
-const string CompositeVisitor::toString(){
+const  std::string CompositeVisitor::toString(){
   VisitorIterator i;
-  string result;
+   std::string result;
   char buffer[65535];
 
   sprintf(buffer ,"******************************************************************\n");
@@ -118,4 +159,4 @@ void CompositeVisitor::update(){
     curVisitor->update();
  }
 
-}//namespace oopse
\ No newline at end of file
+}//namespace oopse