Some warnings removed

git-svn-id: svn+ssh://svn.gecode.org/srv/gecode/svn/gecode/trunk@16762 64335634-5103-0410-b293-fc3d331e086d

Author: Christian Schulte

examples/scowl.hpp

@@ -13477,7 +13477,7 @@ FileSizeOptions::file(void) const {
 inline
 Dictionary::Dictionary(void)
   : max_len(0), n_all_words(0), chunk(NULL) {
-  for (int i=max_len; i--; ) {
+  for (unsigned int i=max_len; i--; ) {
     n_words[i]=0; s_words[i]=NULL;
   }
 }

gecode/flatzinc/branch.hh

@@ -288,6 +288,8 @@ namespace Gecode { namespace FlatZinc {
     /// Check status of brancher, return true if alternatives left
     virtual bool status(const Space& home) const;
     /// Return choice
+    virtual const Choice* choice(Space& home) = 0;
+    /// Return choice
     virtual const Choice* choice(const Space& home, Archive& e);
     /// Perform commit for choice \a c and alternative \a b
     virtual ExecStatus commit(Space& home, const Choice& c, unsigned int b);

gecode/int.hh

@@ -2124,7 +2124,7 @@ namespace Gecode {
     /// Return largest symbol in DFA
     int symbol_max(void) const;
     /// Return hash key
-    size_t hash(void) const;
+    std::size_t hash(void) const;
   };
 
 }
@@ -2197,7 +2197,7 @@ namespace Gecode {
       /// Largest value
       int max;
       /// Hash key
-      size_t key;
+      std::size_t key;
       /// Tuple data
       int* td;
       /// Value data
@@ -2302,7 +2302,7 @@ namespace Gecode {
     /// Return maximal value in all tuples
     int max(void) const;
     /// Return hash key
-    size_t hash(void) const;
+    std::size_t hash(void) const;
     //@}
 
     /// \name Range access and iteration

gecode/int/extensional/dfa.hpp

@@ -58,7 +58,7 @@ namespace Gecode {
     /// Last final state
     int final_lst;
     /// Hash key
-    size_t key;
+    std::size_t key;
     /// The transitions
     Transition* trans;
     /// Specification of transition range
@@ -95,7 +95,7 @@ namespace Gecode {
 
   forceinline void
   DFA::DFAI::fill(void) {
-    key = static_cast<size_t>(n_states);
+    key = static_cast<std::size_t>(n_states);
     cmb_hash(key, n_trans);
     cmb_hash(key, n_symbols);
     cmb_hash(key, final_fst);
@@ -189,7 +189,7 @@ namespace Gecode {
       d->trans[d->n_trans-1].symbol : Int::Limits::max;
   }
 
-  forceinline size_t
+  forceinline std::size_t
   DFA::hash(void) const {
     const DFAI* d = static_cast<DFAI*>(object());
     return (d != NULL) ? d->key : 0;

gecode/int/extensional/tuple-set.cpp

@@ -139,7 +139,7 @@ namespace Gecode {
       assert(j <= n_tuples);
       n_tuples=j;
       // Initialize hash key
-      key = static_cast<size_t>(n_tuples);
+      key = static_cast<std::size_t>(n_tuples);
       cmb_hash(key, arity);
       // Copy into now possibly smaller area
       int* new_td = heap.alloc<int>(n_tuples*arity);

gecode/int/extensional/tuple-set.hpp

@@ -227,7 +227,7 @@ namespace Gecode {
     return equal(t);
   }
 
-  forceinline size_t
+  forceinline std::size_t
   TupleSet::hash(void) const {
     return data().key;
   }

gecode/support/hash.hpp

@@ -40,25 +40,25 @@
 namespace Gecode {
 
   /// Combine hash value \a h into \a seed
-  void cmb_hash(size_t& seed, size_t h);
+  void cmb_hash(std::size_t& seed, std::size_t h);
   /// Combine hash value \a h into \a seed
-  void cmb_hash(size_t& seed, int h);
+  void cmb_hash(std::size_t& seed, int h);
   /// Combine hash value \a h into \a seed
-  void cmb_hash(size_t& seed, unsigned int h);
+  void cmb_hash(std::size_t& seed, unsigned int h);
 
 
   forceinline void
-  cmb_hash(size_t& seed, size_t h) {
+  cmb_hash(std::size_t& seed, size_t h) {
     seed ^= h + 0x9e3779b9 + (seed << 6) + (seed >> 2);
   }
 
   forceinline void
-  cmb_hash(size_t& seed, int h) {
+  cmb_hash(std::size_t& seed, int h) {
     cmb_hash(seed, static_cast<size_t>(h));
   }
 
   forceinline void
-  cmb_hash(size_t& seed, unsigned int h) {
+  cmb_hash(std::size_t& seed, unsigned int h) {
     cmb_hash(seed, static_cast<size_t>(h));
   }