1.1 --- a/lemon/iterable_maps.h	Fri Mar 02 17:56:22 2007 +0000
     1.2 +++ b/lemon/iterable_maps.h	Fri Mar 02 18:04:28 2007 +0000
     1.3 @@ -97,7 +97,7 @@
     1.4      public:
     1.5  
     1.6        Reference& operator=(const Reference& value) {
     1.7 -	_map.set(_key, (bool)value);
     1.8 +	_map.set(_key, static_cast<bool>(value));
     1.9   	return *this;
    1.10        }
    1.11  
    1.12 @@ -247,7 +247,7 @@
    1.13        /// keys which mapped to false.
    1.14        /// \param _map The IterableIntMap
    1.15        explicit FalseIt(const IterableBoolMap& _map) 
    1.16 -        : Parent(_map.sep < (int)_map.array.size() ? 
    1.17 +        : Parent(_map.sep < int(_map.array.size()) ? 
    1.18                   _map.array.back() : INVALID), map(&_map) {}
    1.19  
    1.20        /// \brief Invalid constructor \& conversion.
    1.21 @@ -288,7 +288,7 @@
    1.22        /// \param value Which elements should be iterated.
    1.23        ItemIt(const IterableBoolMap& _map, bool value) 
    1.24          : Parent(value ? (_map.sep > 0 ? _map.array[_map.sep - 1] : INVALID) :
    1.25 -                 (_map.sep < (int)_map.array.size() ? 
    1.26 +                 (_map.sep < int(_map.array.size()) ? 
    1.27                    _map.array.back() : INVALID)), map(&_map) {}
    1.28  
    1.29        /// \brief Invalid constructor \& conversion.
    1.30 @@ -321,7 +321,7 @@
    1.31  
    1.32      virtual void add(const std::vector<Key>& keys) {
    1.33        Parent::add(keys);
    1.34 -      for (int i = 0; i < (int)keys.size(); ++i) {
    1.35 +      for (int i = 0; i < int(keys.size()); ++i) {
    1.36          Parent::set(keys[i], array.size());
    1.37          array.push_back(keys[i]);
    1.38        }
    1.39 @@ -345,7 +345,7 @@
    1.40      }
    1.41  
    1.42      virtual void erase(const std::vector<Key>& keys) {
    1.43 -      for (int i = 0; i < (int)keys.size(); ++i) {
    1.44 +      for (int i = 0; i < int(keys.size()); ++i) {
    1.45          int pos = position(keys[i]); 
    1.46          if (pos < sep) {
    1.47            --sep;
    1.48 @@ -456,7 +456,7 @@
    1.49      void lace(const Key& key) {
    1.50        typename Parent::Value& node = Parent::operator[](key);
    1.51        if (node.value < 0) return;
    1.52 -      if (node.value >= (int)first.size()) {
    1.53 +      if (node.value >= int(first.size())) {
    1.54  	first.resize(node.value + 1, INVALID);
    1.55        } 
    1.56        node.prev = INVALID;
    1.57 @@ -484,7 +484,7 @@
    1.58      public:
    1.59  
    1.60        Reference& operator=(const Reference& value) {
    1.61 -	_map.set(_key, (const int&)value);
    1.62 +	_map.set(_key, static_cast<const int&>(value));
    1.63   	return *this;
    1.64        }
    1.65  
    1.66 @@ -617,7 +617,7 @@
    1.67        /// \param map The IterableIntMap
    1.68        /// \param value The value
    1.69        ItemIt(const IterableIntMap& map, int value) : _map(&map) {
    1.70 -	if (value < 0 || value >= (int)_map->first.size()) {	  
    1.71 +	if (value < 0 || value >= int(_map->first.size())) {	  
    1.72  	  Parent::operator=(INVALID);
    1.73  	} else {
    1.74  	  Parent::operator=(_map->first[value]);
    1.75 @@ -646,7 +646,7 @@
    1.76      }
    1.77  
    1.78      virtual void erase(const std::vector<Key>& keys) {
    1.79 -      for (int i = 0; i < (int)keys.size(); ++i) {
    1.80 +      for (int i = 0; i < int(keys.size()); ++i) {
    1.81          unlace(keys[i]);
    1.82        }
    1.83        Parent::erase(keys);
    1.84 @@ -884,7 +884,7 @@
    1.85  
    1.86      virtual void add(const std::vector<Key>& keys) {
    1.87        Parent::add(keys);
    1.88 -      for (int i = 0; i < (int)keys.size(); ++i) {
    1.89 +      for (int i = 0; i < int(keys.size()); ++i) {
    1.90          lace(keys[i]);
    1.91        }
    1.92      }
    1.93 @@ -895,7 +895,7 @@
    1.94      }
    1.95  
    1.96      virtual void erase(const std::vector<Key>& keys) {
    1.97 -      for (int i = 0; i < (int)keys.size(); ++i) {
    1.98 +      for (int i = 0; i < int(keys.size()); ++i) {
    1.99          unlace(keys[i]);
   1.100        }
   1.101        Parent::erase(keys);