Add missing BOOST_IF_CONSTEXPR for constant conditions

Author: igaztanaga

include/boost/interprocess/allocators/detail/allocator_common.hpp

@@ -255,8 +255,7 @@ class cache_impl
       if(m_cached_nodes.empty()){
          mp_node_pool->allocate_nodes(m_max_cached_nodes/2, m_cached_nodes);
       }
-      void *ret = ipcdetail::to_raw_pointer(m_cached_nodes.pop_front());
-      return ret;
+      return ipcdetail::to_raw_pointer(m_cached_nodes.pop_front());
    }
 
    void cached_allocation(size_type n, multiallocation_chain &chain)
@@ -540,14 +539,14 @@ class node_pool_allocation_impl
       if(size_overflows<sizeof(T)>(count)){
          throw bad_alloc();
       }
-      else if(Version == 1 && count == 1){
-         return pointer(static_cast<value_type*>
-         (pool->allocate_node()));
-      }
-      else{
-         return pointer(static_cast<value_type*>
-            (pool->get_segment_manager()->allocate_aligned(count*sizeof(T), boost::container::dtl::alignment_of<T>::value)));
+      
+      BOOST_IF_CONSTEXPR(Version == 1)
+      if(count == 1){
+         return pointer(static_cast<value_type*>(pool->allocate_node()));
       }
+
+      return pointer(static_cast<value_type*>
+         (pool->get_segment_manager()->allocate_aligned(count*sizeof(T), boost::container::dtl::alignment_of<T>::value)));
    }
 
    //!Deallocate allocated memory. Never throws
@@ -556,10 +555,14 @@ class node_pool_allocation_impl
       (void)count;
       typedef typename node_pool<0>::type node_pool_t;
       node_pool_t *pool = node_pool<0>::get(this->derived()->get_node_pool());
-      if(Version == 1 && count == 1)
+      
+      BOOST_IF_CONSTEXPR(Version == 1)
+      if(count == 1){
          pool->deallocate_node(ipcdetail::to_raw_pointer(ptr));
-      else
-         pool->get_segment_manager()->deallocate((void*)ipcdetail::to_raw_pointer(ptr));
+         return;
+      }
+
+      pool->get_segment_manager()->deallocate((void*)ipcdetail::to_raw_pointer(ptr));
    }
 
    //!Allocates just one object. Memory allocated with this function
@@ -729,30 +732,29 @@ class cached_allocator_impl
    BOOST_INTERPROCESS_NODISCARD
    pointer allocate(size_type count)
    {
-      void * ret;
       if(size_overflows<sizeof(T)>(count)){
          throw bad_alloc();
       }
-      else if(Version == 1 && count == 1){
-         ret = m_cache.cached_allocation();
-      }
-      else{
-         ret = this->get_segment_manager()->allocate_aligned
-                  (count*sizeof(T), boost::container::dtl::alignment_of<T>::value);
+
+      BOOST_IF_CONSTEXPR(Version == 1)
+      if(count == 1){
+         return pointer(static_cast<T*>(m_cache.cached_allocation()));
       }
-      return pointer(static_cast<T*>(ret));
+
+      return pointer(static_cast<value_type*>
+         (this->get_segment_manager()->allocate_aligned(count*sizeof(T), boost::container::dtl::alignment_of<T>::value)));
    }
 
    //!Deallocate allocated memory. Never throws
    void deallocate(const pointer &ptr, size_type count)
    {
       (void)count;
-      if(Version == 1 && count == 1){
+      BOOST_IF_CONSTEXPR(Version == 1)
+      if (count == 1) {
          m_cache.cached_deallocation(ipcdetail::to_raw_pointer(ptr));
+         return;
       }
-      else{
-         this->get_segment_manager()->deallocate((void*)ipcdetail::to_raw_pointer(ptr));
-      }
+      this->get_segment_manager()->deallocate((void*)ipcdetail::to_raw_pointer(ptr));
    }
 
    //!Allocates just one object. Memory allocated with this function

include/boost/interprocess/detail/windows_intermodule_singleton.hpp

@@ -72,7 +72,7 @@ class windows_semaphore_based_map
       //those values can't be negative, so we have 31 bits to store something
       //in max_count and initial count parameters.
       //Also, max count must be bigger than 0 and bigger or equal than initial count.
-      if(sizeof(void*) == sizeof(boost::uint32_t)){
+      BOOST_IF_CONSTEXPR(sizeof(void*) == sizeof(boost::uint32_t)){
          //This means that for 32 bit processes, a semaphore count (31 usable bits) is
          //enough to store 4 byte aligned memory (4GB -> 32 bits - 2 bits = 30 bits).
          //The max count will hold the pointer value and current semaphore count
@@ -90,7 +90,7 @@ class windows_semaphore_based_map
          BOOST_ASSERT((caster.addr_uint32 & boost::uint32_t(3)) == 0);
          max_count = caster.addr_uint32 >> 2;
       }
-      else if(sizeof(void*) == sizeof(boost::uint64_t)){
+      else BOOST_IF_CONSTEXPR(sizeof(void*) == sizeof(boost::uint64_t)){
          //Relying in UB with a cast through union, but all known windows compilers
          //accept this (C11 accepts this).
          union caster_union
@@ -156,7 +156,7 @@ class windows_semaphore_based_map
 
    map_type &get_map_unlocked()
    {
-      if(sizeof(void*) == sizeof(boost::uint32_t)){
+      BOOST_IF_CONSTEXPR(sizeof(void*) == sizeof(boost::uint32_t)){
          union caster_union
          {
             void *addr;