Some warning for gcc and msvc removed

git-svn-id: file:///Users/tack/GecodeGitMigration/gecode-svn-mirror/gecode/trunk@14471 e85b7adc-8362-4630-8c63-7469d557c915

examples/crossword.cpp

@@ -164,7 +164,7 @@ class Crossword : public Script {
     }
   }
   /// Print brancher information when branching on letters
-  static void printletters(const Space& home, const BrancherHandle& bh,
+  static void printletters(const Space& home, const BrancherHandle&,
                            unsigned int a,
                            IntVar, int i, const int& n,
                            std::ostream& o) {
@@ -175,7 +175,7 @@ class Crossword : public Script {
       << static_cast<char>(n);
   }
   /// Print brancher information when branching on words
-  static void printwords(const Space&, const BrancherHandle& bh,
+  static void printwords(const Space&, const BrancherHandle&,
                          unsigned int a,
                          IntVar, int i, const int& n,
                          std::ostream& o) {

gecode/int/arithmetic/argmax.hpp

@@ -156,7 +156,7 @@ namespace Gecode { namespace Int { namespace Arithmetic {
         }
       x.size(j);
 
-      if (n == y.size())
+      if (static_cast<unsigned int>(n) == y.size())
         return ES_FAILED;
       Iter::Values::Array id(d,n);
       GECODE_ME_CHECK(y.minus_v(home,id,false));

gecode/int/bin-packing/conflict-graph.hpp

@@ -210,7 +210,7 @@ namespace Gecode { namespace Int { namespace BinPacking {
         return ES_FAILED;
     }
     // Compute corresponding variables
-    ViewArray<IntView> bv(home,cur.c);
+    ViewArray<IntView> bv(home,static_cast<int>(cur.c));
     int i=0;
     for (Nodes c(cur.n); c() < nodes(); ++c)
       bv[i++] = b[c()];
@@ -337,7 +337,7 @@ namespace Gecode { namespace Int { namespace BinPacking {
     for (Nodes i(max.n); i() < nodes(); ++i)
       n[j++]=i();
     assert(j == static_cast<int>(max.c));
-    IntSet s(n,max.c);
+    IntSet s(n,static_cast<int>(max.c));
     return s;
   }
 

gecode/int/cumulative.cpp

@@ -87,7 +87,7 @@ namespace Gecode {
           fixp = false; break;
         }
       int nonOptionals = 0;
-      for (unsigned int i=u.size(); i--;)
+      for (int i=u.size(); i--;)
         if (u[i]>0) nonOptionals++;
       if (fixp) {
         TaskArray<ManFixPTask> tasks(home,nonOptionals);
@@ -162,7 +162,7 @@ namespace Gecode {
           fixp = false; break;
         }
       int nonOptionals = 0;
-      for (unsigned int i=u.size(); i--;)
+      for (int i=u.size(); i--;)
         if (u[i]>0) nonOptionals++;
       if (fixp) {
         TaskArray<OptFixPTask> tasks(home,nonOptionals);
@@ -236,7 +236,7 @@ namespace Gecode {
       unary(home,s,p,icl);
     } else {
       int nonOptionals = 0;
-      for (unsigned int i=u.size(); i--;)
+      for (int i=u.size(); i--;)
         if (u[i]>0) nonOptionals++;
       TaskArray<ManFixPTask> t(home,nonOptionals);
       int cur = 0;
@@ -294,7 +294,7 @@ namespace Gecode {
       cumulative(home,c,s,p,u,icl);
     } else {
       int nonOptionals = 0;
-      for (unsigned int i=u.size(); i--;)
+      for (int i=u.size(); i--;)
         if (u[i]>0) nonOptionals++;
       TaskArray<OptFixPTask> t(home,nonOptionals);
       int cur = 0;
@@ -358,7 +358,7 @@ namespace Gecode {
       cumulative(home,c,s,pp,u,icl);
     } else {
       int nonOptionals = 0;
-      for (unsigned int i=u.size(); i--;)
+      for (int i=u.size(); i--;)
         if (u[i]>0) nonOptionals++;
       TaskArray<ManFlexTask> t(home,nonOptionals);
       int cur = 0;
@@ -421,7 +421,7 @@ namespace Gecode {
       cumulative(home,c,s,p,e,u,icl);
     } else {
       int nonOptionals = 0;
-      for (unsigned int i=u.size(); i--;)
+      for (int i=u.size(); i--;)
         if (u[i]>0) nonOptionals++;
       TaskArray<OptFlexTask> t(home,nonOptionals);
       int cur = 0;

gecode/kernel/brancher-view-val.hpp

@@ -234,7 +234,7 @@ namespace Gecode {
   }
 
   template<class View, int n, class Val, unsigned int a>
-  forceinline BrancherHandle
+  inline BrancherHandle
   ViewValBrancher<View,n,Val,a>::
   post(Home home, ViewArray<View>& x,
        ViewSel<View>* vs[n], ValSelCommitBase<View,Val>* vsc,

gecode/kernel/core.hpp

@@ -3858,6 +3858,7 @@ namespace Gecode {
       case ES_NOFIX_FORCE:
         schedule(home,p,me,true);
         break;
+      case __ES_SUBSUMED:
       default:
         GECODE_NEVER;
       }

gecode/minimodel.hh

@@ -1869,7 +1869,7 @@ namespace Gecode {
   values(Home home, const IntVarArgs& x, IntSet y,
          IntConLevel icl=ICL_DEF) {
     dom(home,x,y,icl);
-    nvalues(home,x,IRT_EQ,y.size(),icl);
+    nvalues(home,x,IRT_EQ,static_cast<int>(y.size()),icl);
   }
 
   //@}

gecode/minimodel/set-expr.cpp

@@ -363,6 +363,9 @@ namespace Gecode {
           case SRT_CMPL:
             invsrt = srt;
             break;
+          default: 
+            invsrt = srt;
+            GECODE_NEVER;
           }
           dom(home, s, invsrt, ss, b);
         }

gecode/search/cutoff.cpp

@@ -82,12 +82,12 @@ namespace Gecode { namespace Search {
 
   unsigned long int 
   CutoffGeometric::operator ()(void) const {
-    return scale * n;
+    return static_cast<unsigned long int>(scale * n);
   }
   unsigned long int 
   CutoffGeometric::operator ++(void) {
     n *= base;
-    return scale * n;
+    return static_cast<unsigned long int>(scale * n);
   }
 
 

gecode/search/meta/nogoods.hh

@@ -144,7 +144,7 @@ namespace Gecode { namespace Search { namespace Meta {
   forceinline ExecStatus 
   NoGoodsProp::post(Space& home, const Path& p) {
     int s = 0;
-    int n = std::min(p.ds.entries(),p.ngdl());
+    int n = std::min(p.ds.entries(),static_cast<int>(p.ngdl()));
 
     unsigned long int n_nogood = 0;
 

gecode/search/parallel/bab.hh

@@ -64,7 +64,7 @@ namespace Gecode { namespace Search { namespace Parallel {
       /// Try to find some work
       void find(void);
       /// Reset engine to restart at space \a s
-      void reset(Space* s, int ngdl);
+      void reset(Space* s, unsigned int ngdl);
       /// Destructor
       virtual ~Worker(void);
     };
@@ -112,12 +112,13 @@ namespace Gecode { namespace Search { namespace Parallel {
   }
 
   forceinline void
-  BAB::Worker::reset(Space* s, int ngdl) {
+  BAB::Worker::reset(Space* s, unsigned int ngdl) {
     delete cur;
     delete best;
     best = NULL;
     path.reset((s == NULL) ? 0 : ngdl);
-    d = mark = 0;
+    d = 0;
+    mark = 0;
     idle = false;
     if ((s == NULL) || (s->status(*this) == SS_FAILED)) {
       delete s;

gecode/search/parallel/dfs.hh

@@ -57,7 +57,7 @@ namespace Gecode { namespace Search { namespace Parallel {
       /// Try to find some work
       void find(void);
       /// Reset worker to restart at space \a s
-      void reset(Space* s, int ngdl);
+      void reset(Space* s, unsigned int ngdl);
     };
     /// Array of worker references
     Worker** _worker;
@@ -128,7 +128,7 @@ namespace Gecode { namespace Search { namespace Parallel {
    * Reset
    */
   forceinline void
-  DFS::Worker::reset(Space* s, int ngdl) {
+  DFS::Worker::reset(Space* s, unsigned int ngdl) {
     delete cur;
     path.reset((s != NULL) ? ngdl : 0);
     d = 0;

gecode/search/parallel/engine.hh

@@ -240,7 +240,7 @@ namespace Gecode { namespace Search { namespace Parallel {
   forceinline
   Engine::Worker::Worker(Space* s, Engine& e)
     : _engine(e), 
-      path(s == NULL ? 0 : static_cast<int>(e.opt().nogoods_limit)), d(0), 
+      path(s == NULL ? 0 : e.opt().nogoods_limit), d(0), 
       idle(false) {
     if (s != NULL) {
       if (s->status(*this) == SS_FAILED) {

gecode/search/parallel/path.hh

@@ -108,16 +108,16 @@ namespace Gecode { namespace Search { namespace Parallel {
     /// Stack to store edge information
     Support::DynamicStack<Edge,Heap> ds;
     /// Depth limit for no-good generation
-    int _ngdl;
+    unsigned int _ngdl;
     /// Number of edges that have work for stealing
     unsigned int n_work;
   public:
     /// Initialize with no-good depth limit \a l
-    Path(int l);
+    Path(unsigned int l);
     /// Return no-good depth limit
-    int ngdl(void) const;
+    unsigned int ngdl(void) const;
     /// Set no-good depth limit to \a l
-    void ngdl(int l);
+    void ngdl(unsigned int l);
     /// Push space \a c (a clone of \a s or NULL)
     const Choice* push(Worker& stat, Space* s, Space* c);
     /// Generate path for next node
@@ -140,7 +140,7 @@ namespace Gecode { namespace Search { namespace Parallel {
     /// Return number of entries on stack
     int entries(void) const;
     /// Reset stack and set no-good depth limit to \a l
-    void reset(int l);
+    void reset(unsigned int l);
     /// Make a quick check whether stealing might be feasible
     bool steal(void) const;
     /// Steal work at depth \a d
@@ -222,16 +222,16 @@ namespace Gecode { namespace Search { namespace Parallel {
    */
 
   forceinline
-  Path::Path(int l) 
+  Path::Path(unsigned int l) 
     : ds(heap), _ngdl(l), n_work(0) {}
 
-  forceinline int
+  forceinline unsigned int
   Path::ngdl(void) const {
     return _ngdl;
   }
 
   forceinline void
-  Path::ngdl(int l) {
+  Path::ngdl(unsigned int l) {
     _ngdl = l;
   }
 
@@ -306,7 +306,7 @@ namespace Gecode { namespace Search { namespace Parallel {
   }
 
   forceinline void
-  Path::reset(int l) {
+  Path::reset(unsigned int l) {
     n_work = 0;
     while (!ds.empty())
       ds.pop().dispose();
@@ -340,7 +340,7 @@ namespace Gecode { namespace Search { namespace Parallel {
         if (!ds[n].work())
           n_work--;
         // No no-goods can be extracted above n
-        ngdl(std::min(ngdl(),n));
+        ngdl(std::min(ngdl(),static_cast<unsigned int>(n)));
         d = stat.steal_depth(static_cast<unsigned long int>(n+1));
         return c;
       }
@@ -362,7 +362,7 @@ namespace Gecode { namespace Search { namespace Parallel {
       assert(ds.entries()-1 == lc());
       ds.top().space(NULL);
       // Mark as reusable
-      if (ds.entries() > ngdl())
+      if (static_cast<unsigned int>(ds.entries()) > ngdl())
         ds.top().next();
       d = 0;
       return s;
@@ -431,7 +431,7 @@ namespace Gecode { namespace Search { namespace Parallel {
       }
       ds.top().space(NULL);
       // Mark as reusable
-      if (ds.entries() > ngdl())
+      if (static_cast<unsigned int>(ds.entries()) > ngdl())
         ds.top().next();
       d = 0;
       return s;

gecode/search/sequential/bab.hh

@@ -81,8 +81,7 @@ namespace Gecode { namespace Search { namespace Sequential {
 
   forceinline 
   BAB::BAB(Space* s, const Options& o)
-    : opt(o), path(static_cast<int>(opt.nogoods_limit)), 
-      d(0), mark(0), best(NULL) {
+    : opt(o), path(opt.nogoods_limit), d(0), mark(0), best(NULL) {
     if ((s == NULL) || (s->status(*this) == SS_FAILED)) {
       fail++;
       cur = NULL;
@@ -173,7 +172,8 @@ namespace Gecode { namespace Search { namespace Sequential {
     delete best;
     best = NULL;
     path.reset();
-    d = mark = 0U;
+    d = 0;
+    mark = 0;
     delete cur;
     if ((s == NULL) || (s->status(*this) == SS_FAILED)) {
       delete s;

gecode/search/sequential/dfs.hh

@@ -73,7 +73,7 @@ namespace Gecode { namespace Search { namespace Sequential {
 
   forceinline 
   DFS::DFS(Space* s, const Options& o)
-    : opt(o), path(static_cast<int>(opt.nogoods_limit)), d(0) {
+    : opt(o), path(opt.nogoods_limit), d(0) {
     if ((s == NULL) || (s->status(*this) == SS_FAILED)) {
       fail++;
       cur = NULL;

gecode/search/sequential/path.hh

@@ -104,14 +104,14 @@ namespace Gecode { namespace Search { namespace Sequential {
     /// Stack to store edge information
     Support::DynamicStack<Edge,Heap> ds;
     /// Depth limit for no-good generation
-    int _ngdl;
+    unsigned int _ngdl;
   public:
     /// Initialize with no-good depth limit \a l
-    Path(int l);
+    Path(unsigned int l);
     /// Return no-good depth limit
-    int ngdl(void) const;
+    unsigned int ngdl(void) const;
     /// Set no-good depth limit to \a l
-    void ngdl(int l);
+    void ngdl(unsigned int l);
     /// Push space \a c (a clone of \a s or NULL)
     const Choice* push(Worker& stat, Space* s, Space* c);
     /// Generate path for next node
@@ -205,16 +205,16 @@ namespace Gecode { namespace Search { namespace Sequential {
    */
 
   forceinline
-  Path::Path(int l) 
+  Path::Path(unsigned int l) 
     : ds(heap), _ngdl(l) {}
 
-  forceinline int
+  forceinline unsigned int
   Path::ngdl(void) const {
     return _ngdl;
   }
 
   forceinline void
-  Path::ngdl(int l) {
+  Path::ngdl(unsigned int l) {
     _ngdl = l;
   }
 
@@ -299,7 +299,7 @@ namespace Gecode { namespace Search { namespace Sequential {
       assert(ds.entries()-1 == lc());
       ds.top().space(NULL);
       // Mark as reusable
-      if (ds.entries() > ngdl())
+      if (static_cast<unsigned int>(ds.entries()) > ngdl())
         ds.top().next();
       d = 0;
       return s;
@@ -368,7 +368,7 @@ namespace Gecode { namespace Search { namespace Sequential {
       }
       ds.top().space(NULL);
       // Mark as reusable
-      if (ds.entries() > ngdl())
+      if (static_cast<unsigned int>(ds.entries()) > ngdl())
         ds.top().next();
       d = 0;
       return s;