aboutsummaryrefslogtreecommitdiff
path: root/vcpkg/ports/boost-container
diff options
context:
space:
mode:
Diffstat (limited to 'vcpkg/ports/boost-container')
-rw-r--r--vcpkg/ports/boost-container/fix_msvc_c4146_warnings.diff110
-rw-r--r--vcpkg/ports/boost-container/portfile.cmake18
-rw-r--r--vcpkg/ports/boost-container/posix-threads.diff21
-rw-r--r--vcpkg/ports/boost-container/vcpkg.json34
4 files changed, 183 insertions, 0 deletions
diff --git a/vcpkg/ports/boost-container/fix_msvc_c4146_warnings.diff b/vcpkg/ports/boost-container/fix_msvc_c4146_warnings.diff
new file mode 100644
index 0000000..9b6afce
--- /dev/null
+++ b/vcpkg/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
diff --git a/vcpkg/ports/boost-container/portfile.cmake b/vcpkg/ports/boost-container/portfile.cmake
new file mode 100644
index 0000000..b1a7160
--- /dev/null
+++ b/vcpkg/ports/boost-container/portfile.cmake
@@ -0,0 +1,18 @@
+# Automatically generated by scripts/boost/generate-ports.ps1
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO boostorg/container
+ REF boost-${VERSION}
+ SHA512 1f7ec9f6e21c107ff07ad0e1b82a815dcad6dca2ac817c34ffa27e42d140209e67f09c7959f307eda31efb6dd9a66bc695004f203c93c65e30927c8062816e10
+ HEAD_REF master
+ PATCHES
+ fix_msvc_c4146_warnings.diff
+ posix-threads.diff
+)
+
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+ SOURCE_PATH "${SOURCE_PATH}"
+ OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/vcpkg/ports/boost-container/posix-threads.diff b/vcpkg/ports/boost-container/posix-threads.diff
new file mode 100644
index 0000000..ee82a2e
--- /dev/null
+++ b/vcpkg/ports/boost-container/posix-threads.diff
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01e97c5..faf17d4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,6 +15,16 @@ add_library(boost_container
+ src/synchronized_pool_resource.cpp
+ src/unsynchronized_pool_resource.cpp
+ )
++if(NOT WIN32)
++ set(THREADS_PREFER_PTHREAD_FLAG 1)
++ find_package(Threads REQUIRED)
++ target_link_libraries(boost_container PUBLIC Threads::Threads)
++ if(EMSCRIPTEN)
++ # Boost config needs `-pthread` to see `_POSIX_THREADS`,
++ # but FindTheads.cmake finishes with `CMAKE_HAVE_LIBC_PTHREAD`.
++ target_compile_options(boost_container PUBLIC -pthread)
++ endif()
++endif()
+
+ add_library(Boost::container ALIAS boost_container)
+
diff --git a/vcpkg/ports/boost-container/vcpkg.json b/vcpkg/ports/boost-container/vcpkg.json
new file mode 100644
index 0000000..6fe8e8b
--- /dev/null
+++ b/vcpkg/ports/boost-container/vcpkg.json
@@ -0,0 +1,34 @@
+{
+ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
+ "name": "boost-container",
+ "version": "1.89.0",
+ "description": "Boost container module",
+ "homepage": "https://www.boost.org/libs/container",
+ "license": "BSL-1.0",
+ "dependencies": [
+ {
+ "name": "boost-assert",
+ "version>=": "1.89.0"
+ },
+ {
+ "name": "boost-cmake",
+ "version>=": "1.89.0"
+ },
+ {
+ "name": "boost-config",
+ "version>=": "1.89.0"
+ },
+ {
+ "name": "boost-headers",
+ "version>=": "1.89.0"
+ },
+ {
+ "name": "boost-intrusive",
+ "version>=": "1.89.0"
+ },
+ {
+ "name": "boost-move",
+ "version>=": "1.89.0"
+ }
+ ]
+}
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-15 02:38:17 +0000