Skip to content

Fixes for Clang compilation #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
starseeker merged 1 commit into from
Aug 7, 2026
Merged

Fixes for Clang compilation #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/cllazyfile/judyL2Array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ struct judyl2KVpair {
/** A judyL2 array maps JudyKey's to multiple JudyValue's, similar to std::multimap.
* Internally, this is a judyL array of std::vector< JudyValue >.
* The first template parameter must be the same size as a void*
* \param JudyKey the type of the key, i.e. uint64_t, etc
* \param JudyValue the type of the value, i.e. int, pointer-to-object, etc. With judyL2Array, the size of this value can vary.
* \tparam JudyKey the type of the key, i.e. uint64_t, etc
* \tparam JudyValue the type of the value, i.e. int, pointer-to-object, etc. With judyL2Array, the size of this value can vary.
*/
template< typename JudyKey, typename JudyValue >
class judyL2Array {
Expand Down
4 changes: 2 additions & 2 deletions include/cllazyfile/judyLArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ struct judylKVpair {
* a JudyValue. Each cell must be set to a non-zero value by the caller.
*
* Both template parameters must be the same size as a void*
* \param JudyKey the type of the key, i.e. uint64_t, pointer-to-object, etc
* \param JudyValue the type of the value
* \tparam JudyKey the type of the key, i.e. uint64_t, pointer-to-object, etc
* \tparam JudyValue the type of the value
*/
template< typename JudyKey, typename JudyValue >
class judyLArray {
Expand Down
2 changes: 1 addition & 1 deletion include/cllazyfile/judyS2Array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct judys2KVpair {

/** A judyS2 array maps a set of strings to multiple JudyValue's, similar to std::multimap.
* Internally, this is a judyS array of std::vector< JudyValue >.
* \param JudyValue the type of the value, i.e. int, pointer-to-object, etc.
* \tparam JudyValue the type of the value, i.e. int, pointer-to-object, etc.
*/
template< typename JudyValue >
class judyS2Array {
Expand Down
33 changes: 14 additions & 19 deletions src/exp2cxx/schema_image.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,29 +666,24 @@ class ImageBuilder {
}

static void writeStringPool( FILE * output, const std::string & data ) {
fprintf( output, " \"" );
size_t column = 5;
fprintf( output, " {\n " );
size_t column = 8;
for( size_t i = 0; i < data.size(); ++i ) {
const unsigned char value =
static_cast<unsigned char>( data[i] );
char escaped[8];
if( value == '"' || value == '\\' ) {
snprintf( escaped, sizeof( escaped ), "\\%c", value );
} else if( value >= 32 && value < 127 ) {
escaped[0] = static_cast<char>( value );
escaped[1] = '\0';
} else {
snprintf( escaped, sizeof( escaped ), "\\%03o", value );
}
const size_t length = strlen( escaped );
if( column + length > 76 ) {
fprintf( output, "\"\n \"" );
column = 5;
if( i ) {
if( column + 6 > 76 ) {
fprintf( output, ",\n " );
column = 8;
} else {
fprintf( output, ", " );
column += 2;
}
}
fprintf( output, "%s", escaped );
column += length;
fprintf( output, "0x%02x", value );
column += 4;
}
fprintf( output, "\"\n" );
fprintf( output, "\n }\n" );
}

public:
Expand Down Expand Up @@ -791,7 +786,7 @@ class ImageBuilder {
" SchemaImageSchemaTextRecord schemaTexts[%zu];\n"
" uint32_t enumElements[%zu];\n"
" SchemaImageRenameRecord renames[%zu];\n"
" char strings[%zu];\n"
" uint8_t strings[%zu];\n"
"};\n\n",
arraySize( _schemas.size() ), arraySize( _entities.size() ),
arraySize( _types.size() ), arraySize( _attributes.size() ),
Expand Down
4 changes: 4 additions & 0 deletions src/exp2cxx/test/api_version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ if(NOT late_all MATCHES "struct GeneratedSchemaImage" OR
late_all MATCHES "InitializeEntityDescriptors|AttributeInitRecord")
message(FATAL_ERROR "late-bound descriptors are not in one packed image")
endif()
if(NOT late_all MATCHES "uint8_t strings\\[[0-9]+\\]" OR
NOT late_all MATCHES "0x00, 0x[0-9a-f][0-9a-f]")
message(FATAL_ERROR "late-bound string pool is not byte-initialized")
endif()
if(late_all MATCHES "SchemaImageTypeBinding|create_SdaiAttachment_method")
message(FATAL_ERROR "late-bound image still uses generated type factories")
endif()
Expand Down
Loading