Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/matrix_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/matrix_maps.h (modified) (16 diffs)

lemon/matrix_maps.h

@@ -350 +350 @@
 
     virtual void add(const Key& key) {
-      if (size(Parent::notifier()->id(key) + 1) >= (int)values.size()) {
+      if (size(Parent::notifier()->id(key) + 1) >= int(values.size())) {
         values.resize(size(Parent::notifier()->id(key) + 1));   
       }
@@ -357 +357 @@
     virtual void add(const std::vector<Key>& keys) {
       int new_size = 0;
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
         if (size(Parent::notifier()->id(keys[i]) + 1) >= new_size) {
           new_size = size(Parent::notifier()->id(keys[i]) + 1); 
         }
       }
-      if (new_size > (int)values.size()) {
+      if (new_size > int(values.size())) {
         values.resize(new_size);
       }
@@ -505 +505 @@
 
     virtual void add(const Key& key) {
-      if (size(Parent::notifier()->id(key) + 1) >= (int)values.size()) {
+      if (size(Parent::notifier()->id(key) + 1) >= int(values.size())) {
         values.resize(size(Parent::notifier()->id(key) + 1));   
       }
@@ -512 +512 @@
     virtual void add(const std::vector<Key>& keys) {
       int new_size = 0;
-      for (int i = 0; i < (int)keys.size(); ++i) {
+      for (int i = 0; i < int(keys.size()); ++i) {
         if (size(Parent::notifier()->id(keys[i]) + 1) >= new_size) {
           new_size = size(Parent::notifier()->id(keys[i]) + 1); 
         }
       }
-      if (new_size > (int)values.size()) {
+      if (new_size > int(values.size())) {
         values.resize(new_size);
       }
@@ -916 +916 @@
     ///class belongs to the FirstKey type.
     void addFirstKey(const FirstKey& firstKey) {
-      int size = (int)values.size();
+      int size = int(values.size());
       if( _first_key_proxy.notifier()->id(firstKey)+1 >= size ){
         values.resize(_first_key_proxy.notifier()->id(firstKey)+1);
-        if( (int)values[0].size() != 0 ){
-          int innersize = (int)values[0].size();
-          for(int i=size; i!=(int)values.size();++i){
+        if( int(values[0].size()) != 0 ){
+          int innersize = int(values[0].size());
+          for(int i = size; i < int(values.size());++i){
             (values[i]).resize(innersize);
           }
         }else if(_second_key_proxy.notifier()->maxId() >= 0){
           int innersize = _second_key_proxy.notifier()->maxId();
-          for(int i = 0; i != (int)values.size(); ++i){
+          for(int i = 0; i < int(values.size()); ++i){
             values[0].resize(innersize);
           }
@@ -939 +939 @@
     void addFirstKeys(const std::vector<FirstKey>& firstKeys){
       int max = values.size() - 1;
-      for(int i=0; i != (int)firstKeys.size(); ++i){
+      for(int i = 0; i < int(firstKeys.size()); ++i){
         int id = _first_key_proxy.notifier()->id(firstKeys[i]);
         if(max < id){
@@ -945 +945 @@
         }
       }
-      int size = (int)values.size();
+      int size = int(values.size());
       if(max >= size){
         values.resize(max + 1);
-        if( (int)values[0].size() != 0){
-          int innersize = (int)values[0].size();
-          for(int i = size; i != (max + 1); ++i){
+        if( int(values[0].size()) != 0){
+          int innersize = int(values[0].size());
+          for(int i = size; i < (max + 1); ++i){
             values[i].resize(innersize);
           }
         }else if(_second_key_proxy.notifier()->maxId() >= 0){
           int innersize = _second_key_proxy.notifier()->maxId();
-          for(int i = 0; i != (int)values.size(); ++i){
+          for(int i = 0; i < int(values.size()); ++i){
             values[i].resize(innersize);
           }
@@ -971 +971 @@
       }
       int id = _second_key_proxy.notifier()->id(secondKey);
-      if(id >= (int)values[0].size()){
-        for(int i=0;i!=(int)values.size();++i){
+      if(id >= int(values[0].size())){
+        for(int i = 0; i < int(values.size());++i){
           values[i].resize(id+1);
         }
@@ -987 +987 @@
       }
       int max = values[0].size();
-      for(int i = 0; i != (int)secondKeys.size(); ++i){
+      for(int i = 0; i < int(secondKeys.size()); ++i){
         int id = _second_key_proxy.notifier()->id(secondKeys[i]);
         if(max < id){
@@ -993 +993 @@
         }
       }
-      if(max > (int)values[0].size()){
-        for(int i = 0; i != (int)values.size(); ++i){
+      if(max > int(values[0].size())){
+        for(int i = 0; i < int(values.size()); ++i){
           values[i].resize(max + 1);
         }
@@ -1006 +1006 @@
     void eraseFirstKey(const FirstKey& first) {
       int id = _first_key_proxy.notifier()->id(first);
-      for(int i = 0; i != (int)values[id].size(); ++i){
+      for(int i = 0; i < int(values[id].size()); ++i){
         values[id][i] = Value();
       }
@@ -1016 +1016 @@
     ///class belongs to the FirstKey type.
     void eraseFirstKeys(const std::vector<FirstKey>& firstKeys) {
-      for(int j = 0; j != (int)firstKeys.size(); ++j){
+      for(int j = 0; j < int(firstKeys.size()); ++j){
         int id = _first_key_proxy.notifier()->id(firstKeys[j]);
-        for(int i = 0; i != (int)values[id].size(); ++i){
+        for(int i = 0; i < int(values[id].size()); ++i){
           values[id][i] = Value();
         }
@@ -1033 +1033 @@
       }
       int id = _second_key_proxy.notifier()->id(second);
-      for(int i = 0; i != (int)values.size(); ++i){
+      for(int i = 0; i < int(values.size()); ++i){
         values[i][id] = Value();
       }
@@ -1046 +1046 @@
         return;
       }
-      for(int j = 0; j != (int)secondKeys.size(); ++j){
+      for(int j = 0; j < int(secondKeys.size()); ++j){
         int id = _second_key_proxy.notifier()->id(secondKeys[j]);
-        for(int i = 0; i != (int)values.size(); ++i){
+        for(int i = 0; i < int(values.size()); ++i){
           values[i][id] = Value();
         }
@@ -1060 +1060 @@
     void build() {
       values.resize(_first_key_proxy.notifier()->maxId());
-      for(int i=0; i!=(int)values.size(); ++i){
+      for(int i = 0; i< int(values.size()); ++i){
         values[i].resize(_second_key_proxy.notifier()->maxId());
       }
@@ -1070 +1070 @@
     ///belongs to the FirstKey or SecondKey type.
     void clear() {
-      for(int i=0; i!=(int)values.size(); ++i) {
+      for(int i = 0; i < int(values.size()); ++i) {
         values[i].clear();
       }