]> git.pld-linux.org Git - packages/crnlib.git/blame - crnlib-types.patch
- updated URL
[packages/crnlib.git] / crnlib-types.patch
CommitLineData
b5d2702a
JB
1--- crunch/crnlib/crn_vector.cpp.orig 2014-05-14 19:48:46.000000000 +0200
2+++ crunch/crnlib/crn_vector.cpp 2014-05-24 06:48:23.591922481 +0200
3@@ -22,8 +22,9 @@ namespace crnlib
4 return true;\r
5 \r
6 size_t new_capacity = min_new_capacity;\r
7- if ((grow_hint) && (!math::is_power_of_2(new_capacity)))\r
8- new_capacity = math::next_pow2(new_capacity);\r
9+ // avoid overload ambiguity (size_t vs uint32=unsigned int or uint64=unsigned long long) by casting to matching type, that will fit size_t\r
10+ if ((grow_hint) && (!math::is_power_of_2(static_cast<ptr_bits_t>(new_capacity))))\r
11+ new_capacity = math::next_pow2(static_cast<ptr_bits_t>(new_capacity));\r
12 \r
13 CRNLIB_ASSERT(new_capacity && (new_capacity > m_capacity));\r
14 \r
15--- crunch/inc/crn_decomp.h.orig 2014-05-14 19:48:47.000000000 +0200
16+++ crunch/inc/crn_decomp.h 2014-05-22 20:49:43.321075804 +0200
17@@ -374,7 +374,7 @@ namespace crnd
18 \r
19 const uint32 cIntBits = 32U;\r
20 \r
21-#ifdef _WIN64\r
22+#if defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__)\r
23 typedef uint64 ptr_bits;\r
24 #else\r
25 typedef uint32 ptr_bits;\r
This page took 0.099339 seconds and 4 git commands to generate.