--- branches/development/src/utils/Utility.hpp	2010/07/09 23:08:25	1465
+++ branches/development/src/utils/Utility.hpp	2011/05/12 17:00:14	1562
@@ -46,6 +46,7 @@
 #include "config.h"
 #include "utils/next_combination.hpp"
 
+using namespace std;
 namespace OpenMD {
   inline RealType roundMe( RealType x ){
     return ( x >= 0 ) ? floor( x + 0.5 ) : ceil( x - 0.5 );
@@ -53,28 +54,33 @@ namespace OpenMD {
 
   /**
    * @brief iteratively replace the sequence with wild cards
-   * @return true if more combination sequence is avaliable, otherwise return true
-   * @param cont iterator container, if expect the whole series of combinations,  pass an empty iterator 
-   * container. The user should not modify this iterator container
+   * @return true if more combination sequence is avaliable, otherwise
+   * return true
+   * @param cont iterator container, if expect the whole series of
+   * combinations, pass an empty iterator container. The user should
+   * not modify this iterator container
    * @param sequence the whole sequence used to generate combination
    * @param result a possible combination sequence which is set on return
    * @param wildCard the wild card string. Its value is "X" by default
-   * @note since next_combination never returns an empty sequence, replaceWildCard will not generate 
-   * one special combination, which is n identical wild cards (n is equal to the size of the passing sequence)
+   * @note since next_combination never returns an empty sequence,
+   * replaceWildCard will not generate one special combination, which
+   * is n identical wild cards (n is equal to the size of the passing
+   * sequence)
    * 
    * @code
-   * std::vector<std::string> sv;
-   * std::vector<std::vector<std::string>::iterator> sic;
-   * std::vector<std::string> resultString;
+   * vector<string> sv;
+   * vector<vector<string>::iterator> sic;
+   * vector<string> resultString;
    * sv.push_back("H");
    * sv.push_back("C");
    * sv.push_back("N");
 
    * while (replaceWithWildCard(sic, sv, resultString)) {   
-   *     for(std::vector<std::string>::iterator i = resultString.begin(); i != resultString.end(); ++i) {
-   *         std::cout << *i << "\t";
+   *     for(vector<string>::iterator i = resultString.begin(); 
+   *          i != resultString.end(); ++i) {
+   *         cout << *i << "\t";
    *     }
-   *     std::cout << std::endl;
+   *     cout << endl;
    * }
    * //output
    * //H X X
@@ -86,8 +92,9 @@ namespace OpenMD {
    * //H C N
    * @endcode
    */
-  bool replaceWithWildCard(std::vector<std::vector<std::string>::iterator>& cont,
-			   std::vector<std::string>& sequence, std::vector<std::string>& result, const std::string& wildCard = "X");
+  bool replaceWithWildCard(vector<vector<string>::iterator>& cont,
+			   vector<string>& sequence, vector<string>& result, 
+                           const string& wildCard = "X");
 }
 #endif