Next try to stick to C++-11

Author: chschulte

gecode/kernel/memory/config.hpp

@@ -122,7 +122,7 @@ namespace Gecode { namespace Kernel {
      * value is used.
      */
 #ifndef GECODE_MEMORY_ALIGNMENT
-#define GECODE_MEMORY_ALIGNMENT 8U
+#define GECODE_MEMORY_ALIGNMENT static_cast<size_t>(8U);
 #endif
     /**
      * \brief Size of region area

gecode/kernel/memory/region.hpp

@@ -32,7 +32,6 @@
  */
 
 #include <cstddef>
-#include <algorithm>
 
 namespace Gecode {
 
@@ -61,8 +60,8 @@ namespace Gecode {
       /// Amount of free memory
       size_t free;
       /// The actual memory area (allocated from top to bottom)
-      alignas(std::max(alignof(std::max_align_t),
-                       GECODE_MEMORY_ALIGNMENT))
+      alignas((alignof(std::max_align_t) > GECODE_MEMORY_ALIGNMENT) ?
+              alignof(std::max_align_t) : GECODE_MEMORY_ALIGNMENT)
         double area[Kernel::MemoryConfig::region_area_size / sizeof(double)];
       /// A pointer to another chunk
       Chunk* next;
@@ -334,8 +333,8 @@ namespace Gecode {
   forceinline bool
   Region::Chunk::alloc(size_t s, void*& p) {
     Kernel::MemoryConfig::align
-      (s,std::max(alignof(std::max_align_t),
-                  GECODE_MEMORY_ALIGNMENT));
+      (s,((alignof(std::max_align_t) > GECODE_MEMORY_ALIGNMENT) ?
+          alignof(std::max_align_t) : GECODE_MEMORY_ALIGNMENT));
     if (s > free)
       return false;
     free -= s;