[boost-container] Fix C4146 warnings in dlmalloc_2_8_6.c and dlmalloc_ext_2_8_6.c

ports/boost-container/fix_msvc_c4146_warnings.diff

@@ -0,0 +1,110 @@
+diff --git a/include/boost/container/detail/config_begin.hpp b/include/boost/container/detail/config_begin.hpp
+index d459a06..693bb14 100644
+--- a/include/boost/container/detail/config_begin.hpp
++++ b/include/boost/container/detail/config_begin.hpp
+@@ -19,7 +19,6 @@
+    #pragma warning (push)
+    #pragma warning (disable : 4619) // there is no warning number 'XXXX'
+    #pragma warning (disable : 4127) // conditional expression is constant
+-   #pragma warning (disable : 4146) // unary minus operator applied to unsigned type, result still unsigned
+    #pragma warning (disable : 4197) // top-level volatile in cast is ignored
+    #pragma warning (disable : 4251) // "identifier" : class "type" needs to have dll-interface to be used by clients of class "type2"
+    #pragma warning (disable : 4275) // non DLL-interface classkey "identifier" used as base for DLL-interface classkey "identifier"
+diff --git a/src/dlmalloc_2_8_6.c b/src/dlmalloc_2_8_6.c
+index 4a5c241..f530927 100644
+--- a/src/dlmalloc_2_8_6.c
++++ b/src/dlmalloc_2_8_6.c
+@@ -1429,9 +1429,6 @@ DLMALLOC_EXPORT int mspace_mallopt(int, int);
+
+ /*------------------------------ internal #includes ---------------------- */
+
+-#ifdef _MSC_VER
+-#pragma warning( disable : 4146 ) /* no "unsigned" warnings */
+-#endif /* _MSC_VER */
+ #if !NO_MALLOC_STATS
+ #include <stdio.h>       /* for printing in malloc_stats */
+ #endif /* NO_MALLOC_STATS */
+@@ -2219,7 +2216,7 @@ typedef unsigned int flag_t;           /* The type of various bit flag sets */
+ #define align_as_chunk(A)   (mchunkptr)((A) + align_offset(chunk2mem(A)))
+
+ /* Bounds on request (not chunk) sizes. */
+-#define MAX_REQUEST         ((-MIN_CHUNK_SIZE) << 2)
++#define MAX_REQUEST         ((0 - MIN_CHUNK_SIZE) << 2)
+ #define MIN_REQUEST         (MIN_CHUNK_SIZE - CHUNK_OVERHEAD - SIZE_T_ONE)
+
+ /* pad request bytes into a usable size */
+@@ -2922,13 +2919,13 @@ static size_t traverse_and_check(mstate m);
+ #define treemap_is_marked(M,i)  ((M)->treemap  &   idx2bit(i))
+
+ /* isolate the least set bit of a bitmap */
+-#define least_bit(x)         ((x) & -(x))
++#define least_bit(x)         ((x) & (0 - (x)))
+
+ /* mask with all bits to left of least bit of x on */
+-#define left_bits(x)         ((x<<1) | -(x<<1))
++#define left_bits(x)         (((x)<<1) | (0 - ((x)<<1)))
+
+ /* mask with all bits to left of or equal to least bit of x on */
+-#define same_or_left_bits(x) ((x) | -(x))
++#define same_or_left_bits(x) ((x) | (0 - (x)))
+
+ /* index corresponding to given bit. Use x86 asm if possible */
+
+@@ -4429,7 +4426,7 @@ static void dispose_chunk(mstate m, mchunkptr p, size_t psize) {
+ /* allocate a large request from the best fitting chunk in a treebin */
+ static void* tmalloc_large(mstate m, size_t nb) {
+   tchunkptr v = 0;
+-  size_t rsize = -nb; /* Unsigned negation */
++  size_t rsize = 0 - nb; /* Unsigned negation */
+   tchunkptr t;
+   bindex_t idx;
+   compute_tree_index(nb, idx);
+@@ -4916,7 +4913,7 @@ static void* internal_memalign(mstate m, size_t alignment, size_t bytes) {
+         */
+         char* br = (char*)mem2chunk((size_t)(((size_t)((char*)mem + alignment -
+                                                        SIZE_T_ONE)) &
+-                                             -alignment));
++                                             (0 - alignment)));
+         char* pos = ((size_t)(br - (char*)(p)) >= MIN_CHUNK_SIZE)?
+           br : br+alignment;
+         mchunkptr newp = (mchunkptr)pos;
+@@ -5420,7 +5417,7 @@ mspace create_mspace(size_t capacity, int locked) {
+   size_t msize;
+   ensure_initialization();
+   msize = pad_request(sizeof(struct malloc_state));
+-  if (capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
++  if (capacity < (size_t) (0 - (msize + TOP_FOOT_SIZE + mparams.page_size))) {
+     size_t rs = ((capacity == 0)? mparams.granularity :
+                  (capacity + TOP_FOOT_SIZE + msize));
+     size_t tsize = granularity_align(rs);
+@@ -5440,7 +5437,7 @@ mspace create_mspace_with_base(void* base, size_t capacity, int locked) {
+   ensure_initialization();
+   msize = pad_request(sizeof(struct malloc_state));
+   if (capacity > msize + TOP_FOOT_SIZE &&
+-      capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
++      capacity < (size_t) (0 - (msize + TOP_FOOT_SIZE + mparams.page_size))) {
+     m = init_user_mstate((char*)base, capacity);
+     m->seg.sflags = EXTERN_BIT;
+     set_lock(m, locked);
+diff --git a/test/expand_bwd_test_template.hpp b/test/expand_bwd_test_template.hpp
+index e86a413..8ad7e47 100644
+--- a/test/expand_bwd_test_template.hpp
++++ b/test/expand_bwd_test_template.hpp
+@@ -98,7 +98,7 @@ bool test_insert_with_expand_bwd()
+          Vect data_to_insert;
+          data_to_insert.resize(InsertSize[iteration]);
+          for(unsigned int i = 0; i < InsertSize[iteration]; ++i){
+-            data_to_insert[i] = static_cast<value_type>((int)-i);
++            data_to_insert[i] = static_cast<value_type>((int)(0-i));
+          }
+
+          if(!life_count<value_type>::check(InitialSize[iteration]+InsertSize[iteration]))
+@@ -161,7 +161,7 @@ bool test_assign_with_expand_bwd()
+       std::vector<value_type> data_to_insert;
+       data_to_insert.resize(InsertSize[iteration]);
+       for(unsigned int i = 0; i < InsertSize[iteration]; ++i){
+-         data_to_insert[i] = static_cast<value_type>((int)-i);
++         data_to_insert[i] = static_cast<value_type>((int)(0-i));
+       }
+
+       //Insert initial data to the vector to test

ports/boost-container/portfile.cmake

@@ -8,6 +8,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         posix-threads.diff
+        fix_msvc_c4146_warnings.diff
 )
 
 set(FEATURE_OPTIONS "")

ports/boost-container/vcpkg.json

@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-container",
   "version": "1.88.0",
+  "port-version": 1,
   "description": "Boost container module",
   "homepage": "https://www.boost.org/libs/container",
   "license": "BSL-1.0",

scripts/boost/generate-ports.ps1

@@ -31,6 +31,7 @@ $defaultPortVersion = 0
 $portVersions = @{
     'boost-charconv' = 1;
     'boost-locale' = 1;
+    'boost-container' = 1;
 }
 
 function Get-PortVersion {

versions/b-/boost-container.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a229975f097e1c17a2d13161cf3cb3706525f62c",
+      "version": "1.88.0",
+      "port-version": 1
+    },
     {
       "git-tree": "718d272c732f63acb5fd80814fc85563f171c735",
       "version": "1.88.0",

versions/baseline.json

@@ -890,7 +890,7 @@
     },
     "boost-container": {
       "baseline": "1.88.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-container-hash": {
       "baseline": "1.88.0",