Skip to content

Commit

Permalink
Add missing size_t -> std::size_t replacements.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SergioRAgostinho
SergioRAgostinho committed Oct 22, 2019
1 parent 8da617e commit 78694f4
Show file tree
Hide file tree
Showing 15 changed files with 139 additions and 139 deletions.
50 changes: 25 additions & 25 deletions surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_archive.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,11 +890,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
bool ReadBool( bool* );

bool ReadChar( // Read an array of 8 bit chars
size_t, // number of chars to read
std::size_t, // number of chars to read
char*
);
bool ReadChar( // Read an array of 8 bit unsigned chars
size_t, // number of unsigned chars to read
std::size_t, // number of unsigned chars to read
unsigned char*
);
bool ReadChar( // Read a single 8 bit char
Expand All @@ -905,11 +905,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool ReadShort( // Read an array of 16 bit shorts
size_t, // number of shorts to read
std::size_t, // number of shorts to read
short*
);
bool ReadShort( // Read an array of 16 bit unsigned shorts
size_t, // number of shorts to read
std::size_t, // number of shorts to read
unsigned short*
);
bool ReadShort( // Read a single 16 bit short
Expand All @@ -920,11 +920,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool ReadInt( // Read an array of 32 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
int*
);
bool ReadInt( // Read an array of 32 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
unsigned int*
);
bool ReadInt( // Read a single 32 bit integer
Expand All @@ -935,11 +935,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool ReadBigInt( // Read an array of 64 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
ON__INT64*
);
bool ReadBigInt( // Read an array of 64 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
ON__UINT64*
);
bool ReadBigInt( // Read a single 64 bit integer
Expand All @@ -950,11 +950,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool ReadLong( // Read an array of 32 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
long*
);
bool ReadLong( // Read an array of 32 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
unsigned long*
);
bool ReadLong( // Read a single 32 bit integer
Expand All @@ -964,7 +964,7 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
unsigned long*
);
bool ReadSize( // Read a single std::size_t
size_t*
std::size_t*
);

bool ReadBigSize( std::size_t* ); // 64 bits
Expand All @@ -973,14 +973,14 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data


bool ReadFloat( // Read an array of floats
size_t, // number of floats
std::size_t, // number of floats
float*
);
bool ReadFloat( // Read a single float
float*
);
bool ReadDouble( // Read an array of IEEE doubles
size_t, // number of doubles
std::size_t, // number of doubles
double*
);
bool ReadDouble( // Read a single double
Expand Down Expand Up @@ -1173,11 +1173,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
bool WriteBool( bool );

bool WriteChar( // Write an array of 8 bit chars
size_t, // number of chars to write
std::size_t, // number of chars to write
const char*
);
bool WriteChar( // Write an array of 8 bit unsigned chars
size_t, // number of unsigned chars to write
std::size_t, // number of unsigned chars to write
const unsigned char*
);
bool WriteChar( // Write a single 8 bit char
Expand All @@ -1188,11 +1188,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool WriteShort( // Write an array of 16 bit shorts
size_t, // number of shorts to write
std::size_t, // number of shorts to write
const short*
);
bool WriteShort( // Write an array of 16 bit unsigned shorts
size_t, // number of shorts to write
std::size_t, // number of shorts to write
const unsigned short*
);
bool WriteShort( // Write a single 16 bit short
Expand All @@ -1203,11 +1203,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool WriteInt( // Write an array of 32 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const int*
);
bool WriteInt( // Write an array of 32 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const unsigned int*
);
bool WriteInt( // Write a single 32 bit integer
Expand All @@ -1218,11 +1218,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool WriteBigInt( // Write an array of 64 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const ON__INT64*
);
bool WriteBigInt( // Write an array of 64 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const ON__UINT64*
);
bool WriteBigInt( // Write a single 64 bit integer
Expand All @@ -1233,11 +1233,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool WriteLong( // Write an array of 32 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const long*
);
bool WriteLong( // Write an array of 32 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const unsigned long*
);
bool WriteLong( // Write a single 32 bit integer
Expand All @@ -1247,15 +1247,15 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
unsigned long
);
bool WriteSize( // Write a single std::size_t
size_t
std::size_t
);

bool WriteBigSize( std::size_t ); // 64 bits

bool WriteBigTime( time_t ); // UCT seconds since 1 January 1970 (64 bits)

bool WriteFloat( // Write a number of IEEE floats
size_t, // number of doubles
std::size_t, // number of doubles
const float*
);
bool WriteFloat( // Write a single float
Expand Down
6 changes: 3 additions & 3 deletions surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_fsp_defs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bool ON_SimpleFixedSizePool<T>::Create(
}

template <class T>
size_t ON_SimpleFixedSizePool<T>::SizeofElement() const
std::size_t ON_SimpleFixedSizePool<T>::SizeofElement() const
{
return ON_FixedSizePool::SizeofElement();
}
Expand Down Expand Up @@ -68,13 +68,13 @@ void ON_SimpleFixedSizePool<T>::Destroy()
}

template <class T>
size_t ON_SimpleFixedSizePool<T>::ActiveElementCount() const
std::size_t ON_SimpleFixedSizePool<T>::ActiveElementCount() const
{
return ON_FixedSizePool::ActiveElementCount();
}

template <class T>
size_t ON_SimpleFixedSizePool<T>::TotalElementCount() const
std::size_t ON_SimpleFixedSizePool<T>::TotalElementCount() const
{
return ON_FixedSizePool::TotalElementCount();
}
Expand Down
42 changes: 21 additions & 21 deletions surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_memory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ extern "C" {
#endif

ON_DECL
size_t ON_MemoryPageSize();
std::size_t ON_MemoryPageSize();

#define ON_MEMORY_POOL void

Expand All @@ -33,31 +33,31 @@ ON_DECL
ON_MEMORY_POOL* ON_WorkerMemoryPool(void);

ON_DECL
void* onmalloc( size_t );
void* onmalloc( std::size_t );

ON_DECL
void* onmalloc_from_pool( ON_MEMORY_POOL*, size_t );
void* onmalloc_from_pool( ON_MEMORY_POOL*, std::size_t );

ON_DECL
void* oncalloc( size_t, size_t );
void* oncalloc( std::size_t, std::size_t );

ON_DECL
void* oncalloc_from_pool( ON_MEMORY_POOL*, size_t, size_t );
void* oncalloc_from_pool( ON_MEMORY_POOL*, std::size_t, std::size_t );

ON_DECL
void onfree( void* );

ON_DECL
void* onrealloc( void*, size_t );
void* onrealloc( void*, std::size_t );

ON_DECL
void* onrealloc_from_pool( ON_MEMORY_POOL*, void*, size_t );
void* onrealloc_from_pool( ON_MEMORY_POOL*, void*, std::size_t );

ON_DECL
size_t onmsize( const void* );
std::size_t onmsize( const void* );

ON_DECL
void* onmemdup( const void*, size_t );
void* onmemdup( const void*, std::size_t );

ON_DECL
char* onstrdup( const char* );
Expand All @@ -71,21 +71,21 @@ ON_DECL
unsigned char* onmbsdup( const unsigned char* );

ON_DECL
size_t onmemoryusecount(
size_t* malloc_count,
size_t* realloc_count,
size_t* free_count,
size_t* pool_count
std::size_t onmemoryusecount(
std::size_t* malloc_count,
std::size_t* realloc_count,
std::size_t* free_count,
std::size_t* pool_count
);

ON_DECL
size_t onmemoryusecountex(
size_t* malloc_count,
size_t* realloc_count,
size_t* free_count,
size_t* pool_count,
size_t* malloc_zero_count,
size_t* free_null_count
std::size_t onmemoryusecountex(
std::size_t* malloc_count,
std::size_t* realloc_count,
std::size_t* free_count,
std::size_t* pool_count,
std::size_t* malloc_zero_count,
std::size_t* free_null_count
);

/* define to handle _TCHAR* ontcsdup( const _TCHAR* ) */
Expand Down
8 changes: 4 additions & 4 deletions surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,13 @@ typedef unsigned short wchar_t;
// 64 bit (8 byte) pointers
#define ON_SIZEOF_POINTER 8
#define ON_64BIT_POINTER
// ON_MAX_SIZET = maximum value of a size_t type
// ON_MAX_SIZET = maximum value of a std::size_t type
#define ON_MAX_SIZE_T 0xFFFFFFFFFFFFFFFF
#else
// 32 bit (4 byte) pointers
#define ON_SIZEOF_POINTER 4
#define ON_32BIT_POINTER
// ON_MAX_SIZET = maximum value of a size_t type
// ON_MAX_SIZET = maximum value of a std::size_t type
#define ON_MAX_SIZE_T 0xFFFFFFFF
#endif

Expand Down Expand Up @@ -458,9 +458,9 @@ typedef unsigned int ON__UINT_PTR;
// on_vsnprintf()/on_vsnwprintf() call _vsnprintf()/_vsnwprintf() in Windows
// and something equivalent in other OSs

int on_vsnprintf( char *buffer, size_t count, const char *format, va_list argptr );
int on_vsnprintf( char *buffer, std::size_t count, const char *format, va_list argptr );

int on_vsnwprintf( wchar_t *buffer, size_t count, const wchar_t *format, va_list argptr );
int on_vsnwprintf( wchar_t *buffer, std::size_t count, const wchar_t *format, va_list argptr );


#endif
Expand Down
Loading

0 comments on commit 78694f4

Please sign in to comment.