--- trunk/src/utils/OpenMDBitSet.cpp	2009/11/25 20:02:06	1390
+++ branches/development/src/utils/OpenMDBitSet.cpp	2012/07/06 22:01:58	1767
@@ -36,12 +36,14 @@
  * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
  * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
  * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
- * [4]  Vardeman & Gezelter, in progress (2009).                        
+ * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
+ * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
 
 #include <algorithm>
 #include <cassert>
 #include <string>
+#include <iterator>
 
 #include "utils/OpenMDBitSet.hpp"
 #include "utils/Algorithm.hpp"
@@ -63,8 +65,8 @@ namespace OpenMD {
     assert(fromIndex <= toIndex);
     assert(fromIndex >=0);
     assert(toIndex <= size());
-    std::vector<char>::iterator first = bitset_.begin() + fromIndex;
-    std::vector<char>::iterator last = bitset_.begin() + toIndex;
+    std::vector<bool>::iterator first = bitset_.begin() + fromIndex;
+    std::vector<bool>::iterator last = bitset_.begin() + toIndex;
 
     std::transform(first, last, first, std::logical_not<bool>());
         
@@ -74,8 +76,8 @@ namespace OpenMD {
     assert(fromIndex <= toIndex);
     assert(fromIndex >=0);
     assert(toIndex <= size());
-    std::vector<char>::iterator first = bitset_.begin() + fromIndex;
-    std::vector<char>::iterator last = bitset_.begin() + toIndex;
+    std::vector<bool>::iterator first = bitset_.begin() + fromIndex;
+    std::vector<bool>::iterator last = bitset_.begin() + toIndex;
 
     OpenMDBitSet result;
     std::copy(first, last, std::back_inserter(result.bitset_));
@@ -83,7 +85,7 @@ namespace OpenMD {
   }
 
   bool OpenMDBitSet::none() {
-    std::vector<char>::iterator i = std::find(bitset_.begin(), bitset_.end(), true);
+    std::vector<bool>::iterator i = std::find(bitset_.begin(), bitset_.end(), true);
     return i == bitset_.end() ? true : false;
   }
     
@@ -141,8 +143,8 @@ namespace OpenMD {
     assert(fromIndex <= toIndex);
     assert(fromIndex >=0);
     assert(toIndex <= size());
-    std::vector<char>::iterator first = bitset_.begin() + fromIndex;
-    std::vector<char>::iterator last = bitset_.begin() + toIndex;
+    std::vector<bool>::iterator first = bitset_.begin() + fromIndex;
+    std::vector<bool>::iterator last = bitset_.begin() + toIndex;
     std::fill(first, last, value);
   }
 
@@ -197,7 +199,7 @@ namespace OpenMD {
   //}
 
   std::ostream& operator<< ( std::ostream& os, const OpenMDBitSet& bs) {
-    for (int i = 0; i < bs.bitset_.size(); ++i) {
+    for (unsigned int i = 0; i < bs.bitset_.size(); ++i) {
       std::string val = bs[i] ? "true" : "false";
       os << "OpenMDBitSet[" << i <<"] = " << val << std::endl; 
     }