Changeset 1361 for trunk

Timestamp:

Apr 19, 2009 12:31:26 PM (12 years ago)

Author:

forrest

Message:

warnings

Location:

trunk/Clp/src

Files:

• ClpSimplex.cpp (modified) (2 diffs)
• unitTest.cpp (modified) (2 diffs)

trunk/Clp/src/ClpSimplex.cpp

@@ -6077 +6077 @@
     if (integerType_) {
       int marker=1;
-      fwrite(&marker,sizeof(int),1,fp);
+      numberWritten=fwrite(&marker,sizeof(int),1,fp);
       numberWritten = fwrite(integerType_,1,numberColumns_,fp);
       if (numberWritten!=numberColumns_)
@@ -6083 +6083 @@
     } else {
       int marker=0;
-      fwrite(&marker,sizeof(int),1,fp);
+      numberWritten=fwrite(&marker,sizeof(int),1,fp);
     }
     // just standard type at present

trunk/Clp/src/unitTest.cpp

@@ -1972 +1972 @@
       std::string topName="row_master";
       std::string blockName="block_";
-      char bName = 'a'+i;
+      char bName = 'a'+static_cast<char>(i);
       blockName.append(1,bName);
       structured.addBlock(topName,blockName,top);
@@ -1998 +1998 @@
     for (int i=0;i<numberBlocks;i++) {
       std::string blockName="block_";
-      char bName = 'a'+i;
+      char bName = 'a'+static_cast<char>(i);
       blockName.append(1,bName);
       structured2.addBlock(blockName,blockName,structured);