boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00
Code Issues Projects Releases Wiki Activity

64/32 bit compile working by using int32 types as needed.

Browse Source
This commit is contained in:
René Ferdinand Rivera Morell
2020-09-09 09:46:08 -05:00
parent 210cef7ae2
commit 84666e77fa
40 changed files with 590 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/engine/jam_strings.cpp
View File

@@ -31,7 +31,7 @@ static void assert_invariants( string * self )
/* String objects modified manually after construction to contain embedded
* '\0' characters are considered structurally valid.
*/
assert( strlen( self->value ) <= self->size );
assert( strlen( self->value ) <= size_t(self->size) );
for ( i = 0; i < 4; ++i )
{
@@ -67,20 +67,20 @@ void string_free( string * s )
}
static void string_reserve_internal( string * self, size_t capacity )
static void string_reserve_internal( string * self, int32_t capacity )
{
if ( self->value == self->opt )
{
self->value = (char *)BJAM_MALLOC_ATOMIC( capacity +
self->value = (char *)BJAM_MALLOC_ATOMIC( size_t(capacity) +
JAM_STRING_MAGIC_SIZE );
self->value[ 0 ] = 0;
size_t opt_size = sizeof(self->opt); // Workaround sizeof in strncat warning.
strncat( self->value, self->opt, opt_size );
assert( strlen( self->value ) <= self->capacity && "Regression test" );
assert( strlen( self->value ) <= size_t(self->capacity) && "Regression test" );
}
else
{
self->value = (char *)BJAM_REALLOC( self->value, capacity +
self->value = (char *)BJAM_REALLOC( self->value, size_t(capacity) +
JAM_STRING_MAGIC_SIZE );
}
#ifndef NDEBUG
@@ -90,7 +90,7 @@ static void string_reserve_internal( string * self, size_t capacity )
}
void string_reserve( string * self, size_t capacity )
void string_reserve( string * self, int32_t capacity )
{
assert_invariants( self );
if ( capacity <= self->capacity )
@@ -100,12 +100,12 @@ void string_reserve( string * self, size_t capacity )
}
static void maybe_reserve( string * self, size_t new_size )
static void maybe_reserve( string * self, int32_t new_size )
{
size_t capacity = self->capacity;
int32_t capacity = self->capacity;
if ( capacity <= new_size )
{
size_t new_capacity = capacity;
int32_t new_capacity = capacity;
while ( new_capacity <= new_size )
new_capacity <<= 1;
string_reserve_internal( self, new_capacity );
@@ -115,13 +115,13 @@ static void maybe_reserve( string * self, size_t new_size )
void string_append( string * self, char const * rhs )
{
size_t rhs_size = strlen( rhs );
size_t new_size = self->size + rhs_size;
int32_t rhs_size = int32_t(strlen( rhs ));
int32_t new_size = self->size + rhs_size;
assert_invariants( self );
maybe_reserve( self, new_size );
memcpy( self->value + self->size, rhs, rhs_size + 1 );
memcpy( self->value + self->size, rhs, size_t(rhs_size) + 1 );
self->size = new_size;
assert_invariants( self );
@@ -130,14 +130,14 @@ void string_append( string * self, char const * rhs )
void string_append_range( string * self, char const * start, char const * finish )
{
size_t rhs_size = finish - start;
size_t new_size = self->size + rhs_size;
int32_t rhs_size = int32_t(finish - start);
int32_t new_size = self->size + rhs_size;
assert_invariants( self );
maybe_reserve( self, new_size );
if ( start != finish )
memcpy( self->value + self->size, start, rhs_size );
memcpy( self->value + self->size, start, size_t(rhs_size) );
self->size = new_size;
self->value[ new_size ] = 0;
@@ -151,7 +151,7 @@ void string_copy( string * s, char const * rhs )
string_append( s, rhs );
}
void string_truncate( string * self, size_t n )
void string_truncate( string * self, int32_t n )
{
assert_invariants( self );
assert( n <= self->capacity );