[Coin-lpsolver] Small patches to silence GCC warnings/errors

[Yan Xu]

Flow cover related patch is applied and committed. I'll leave Probing patch to its manager.
Thanks,
Yan
 

-----Original Message-----
From: coin-lpsolver-bounces at list.coin-or.org [mailto:coin-lpsolver-bounces at list.coin-or.org] On Behalf Of Ulrich Spoerlein
Sent: Friday, December 30, 2005 5:19 AM
To: coin-lpsolver at list.coin-or.org
Subject: [Coin-lpsolver] Small patches to silence GCC warnings/errors

Good day,

when compiling with -pedantic -ansi -Werror and stuff, gcc will complain loudly about some trivial nits (well, you get what you asked for).

Anyway, here are the patches to shut up gcc (this time I'll inline them)


Index: include/CglFlowCover.hpp
===================================================================
RCS file: /home/coin/coincvs/COIN/Cgl/include/CglFlowCover.hpp,v
retrieving revision 1.8
diff -u -p -r1.8 CglFlowCover.hpp
--- include/CglFlowCover.hpp	8 Mar 2005 03:23:47 -0000	1.8
+++ include/CglFlowCover.hpp	30 Dec 2005 09:56:47 -0000
@@ -42,7 +42,7 @@ enum CglFlowColStatus{
     /** The column is a prime candidate. */
     CGLFLOW_COL_PRIME,
     /** The column is a secondary candidate. */
-    CGLFLOW_COL_SECONDARY,
+    CGLFLOW_COL_SECONDARY
 };
 
 /** This enumerative constant describes the various stati of vars in @@ -59,7 +59,7 @@ enum CglFlowColCut{
     /** The column is decided to be in L-. */
     CGLFLOW_COL_INLMINDONE,
     /** The column is in L--.*/
-    CGLFLOW_COL_INLMINMIN,
+    CGLFLOW_COL_INLMINMIN
 };
 
 /** This enumerative constant describes the various row types.*/
Index: include/CglProbing.hpp
===================================================================
RCS file: /home/coin/coincvs/COIN/Cgl/include/CglProbing.hpp,v
retrieving revision 1.17
diff -u -p -r1.17 CglProbing.hpp
--- include/CglProbing.hpp	24 Oct 2005 13:20:57 -0000	1.17
+++ include/CglProbing.hpp	30 Dec 2005 09:56:48 -0000
@@ -145,9 +145,9 @@ public:
   /// Get maximum number of passes per node
   int getMaxPass() const;
   /// Set log level - 0 none, 1 - a bit, 2 - more details
-  void CglProbing::setLogLevel(int value);
+  void setLogLevel(int value);
   /// Get log level
-  int CglProbing::getLogLevel() const;
+  int getLogLevel() const;
   /// Set maximum number of unsatisfied variables to look at
   void setMaxProbe(int value);
   /// Get maximum number of unsatisfied variables to look at

Ulrich Spoerlein
-- 
 PGP Key ID: F0DB9F44				Encrypted mail welcome!
Fingerprint: F1CE D062 0CA9 ADE3 349B  2FE8 980A C6B5 F0DB 9F44 Which is worse: ignorance or apathy?
Don't know. Don't care.
_______________________________________________
Coin-lpsolver mailing list
Coin-lpsolver at list.coin-or.org
http://list.coin-or.org/mailman/listinfo/coin-lpsolver