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

lemon/radix_heap.h

@@ -151 +151 @@
   private:
 
-    bool upper(int box, Prio prio) {
-      return prio < boxes[box].min;
-    }
-
-    bool lower(int box, Prio prio) {
-      return prio >= boxes[box].min + boxes[box].size;
+    bool upper(int box, Prio pr) {
+      return pr < boxes[box].min;
+    }
+
+    bool lower(int box, Prio pr) {
+      return pr >= boxes[box].min + boxes[box].size;
     }
 
@@ -188 +188 @@
     void extend() {
       int min = boxes.back().min + boxes.back().size;
-      int size = 2 * boxes.back().size;
-      boxes.push_back(RadixBox(min, size));
+      int bs = 2 * boxes.back().size;
+      boxes.push_back(RadixBox(min, bs));
     }
 
@@ -201 +201 @@
 
     /// \brief Find up the proper box for the item with the given prio.
-    int findUp(int start, int prio) {
-      while (lower(start, prio)) {
-        if (++start == (int)boxes.size()) {
+    int findUp(int start, int pr) {
+      while (lower(start, pr)) {
+        if (++start == int(boxes.size())) {
           extend();
         }
@@ -219 +219 @@
 
     /// \brief Find up the proper box for the item with the given prio.
-    int findDown(int start, int prio) {
-      while (upper(start, prio)) {
+    int findDown(int start, int pr) {
+      while (upper(start, pr)) {
         if (--start < 0) throw UnderFlowPriorityError();
       }
@@ -261 +261 @@
 
     void relocate_last(int index) {
-      if (index != (int)data.size() - 1) {
+      if (index != int(data.size()) - 1) {
         data[index] = data.back();
         if (data[index].prev != -1) {