Changeset 54e903c in tol

Timestamp:

Aug 4, 2015, 10:23:28 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

59d4d46

Parents:

865a39d3

Message:

refs #1866, limpieza de warnings reportados por -Wall

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6805 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bbasic/bfsmem.cpp (modified) (4 diffs)

tol/bbasic/bfsmem.cpp

@@ -51 +51 @@
 
 static BYTE  pow2_[8] = { 128, 64, 32, 16, 8, 4, 2, 1};
-static BYTE _pow2_[8] = {~128,~64,~32,~16,~8,~4,~2,~1};
+static BYTE _pow2_[8] = {(BYTE)(~128),(BYTE)(~64),(BYTE)(~32),(BYTE)(~16),(BYTE)(~8),(BYTE)(~4),(BYTE)(~2),(BYTE)(~1)};
 static unsigned short byte_pos_;
 static BYTE           bit_pos_;
@@ -419 +419 @@
 //--------------------------------------------------------------------
 : baseSize_           (baseSize),
-  percentThreshold_   (percentThreshold),
   page__              (NULL),
+  lastAllocPg_        (0), 
   lastPage_           (0), 
-  lastAllocPg_        (0), 
   pgNm_               (0),
   lastDelPgNm_        (0),
-  assigned_           (0)
+  assigned_           (0),
+  percentThreshold_   (percentThreshold)
 {
   assert(baseSize<=BFSMEM_MAX_BASE_SIZE);
@@ -648 +648 @@
   if(lastPage_)
   {
+  long int x = maxAllowed_*baseSize_;
     printf("\n"
-           "% 10.4f |"
-           "% 10d |"
-           "% 10d |"
-           "% 10u |"
-           "% 10d |"
-           "% 10ld |"
-           "% 10.2lf%% |",
+           "%10.4f |"
+           "%10d |"
+           "%10d |"
+           "%10u |"
+           "%10d |"
+           "%10ld |"
+           "%10.2lf%% |",
              _growingFactor_,
              _initPageSize_,
@@ -661 +662 @@
              baseSize_, 
              maxAllowed_,
-             maxAllowed_*baseSize_,
+             x,
              double(assigned_*100.0)/double(maxAllowed_));
 /*