Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/iterable_maps.h

Timestamp:

03/02/07 19:04:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3217

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

• lemon/iterable_maps.h (modified) (11 diffs)

lemon/iterable_maps.h

@@ -98 +98 @@
 
       Reference& operator=(const Reference& value) {
-        _map.set(_key, (bool)value);
+        _map.set(_key, static_cast<bool>(value));
         return *this;
       }
@@ -248 +248 @@
       /// \param _map The IterableIntMap
       explicit FalseIt(const IterableBoolMap& _map) 
-        : Parent(_map.sep < (int)_map.array.size() ? 
+        : Parent(_map.sep < int(_map.array.size()) ? 
                  _map.array.back() : INVALID), map(&_map) {}
 
@@ -289 +289 @@
       ItemIt(const IterableBoolMap& _map, bool value) 
         : Parent(value ? (_map.sep > 0 ? _map.array[_map.sep - 1] : INVALID) :
-                 (_map.sep < (int)_map.array.size() ? 
+                 (_map.sep < int(_map.array.size()) ? 
                   _map.array.back() : INVALID)), map(&_map) {}
 
@@ -322 +322 @@
     virtual void add(const std::vector<Key>& keys) {
       Parent::add(keys);
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
         Parent::set(keys[i], array.size());
         array.push_back(keys[i]);
@@ -346 +346 @@
 
     virtual void erase(const std::vector<Key>& keys) {
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
         int pos = position(keys[i]); 
         if (pos < sep) {
@@ -457 +457 @@
       typename Parent::Value& node = Parent::operator[](key);
       if (node.value < 0) return;
-      if (node.value >= (int)first.size()) {
+      if (node.value >= int(first.size())) {
         first.resize(node.value + 1, INVALID);
       } 
@@ -485 +485 @@
 
       Reference& operator=(const Reference& value) {
-        _map.set(_key, (const int&)value);
+        _map.set(_key, static_cast<const int&>(value));
         return *this;
       }
@@ -618 +618 @@
       /// \param value The value
       ItemIt(const IterableIntMap& map, int value) : _map(&map) {
-        if (value < 0 || value >= (int)_map->first.size()) {      
+        if (value < 0 || value >= int(_map->first.size())) {      
           Parent::operator=(INVALID);
         } else {
@@ -647 +647 @@
 
     virtual void erase(const std::vector<Key>& keys) {
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
         unlace(keys[i]);
       }
@@ -885 +885 @@
     virtual void add(const std::vector<Key>& keys) {
       Parent::add(keys);
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
         lace(keys[i]);
       }
@@ -896 +896 @@
 
     virtual void erase(const std::vector<Key>& keys) {
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
         unlace(keys[i]);
       }