Skip to content

Commit 2d325ba

Browse files
sivukhinsivukhin
committed
windows compiler complains about operations with void* pointers
- error C2036: 'void *': unknown size ...
1 parent 26c49a8 commit 2d325ba

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212669,7 +212669,7 @@ int distanceBufferInsertIdx(const float *aDistances, int nSize, int nMaxSize, fl
212669212669
return nSize < nMaxSize ? nSize : -1;
212670212670
}
212671212671

212672-
void bufferInsert(void *aBuffer, int nSize, int nMaxSize, int iInsert, int nItemSize, const void *pItem, void *pLast) {
212672+
void bufferInsert(u8 *aBuffer, int nSize, int nMaxSize, int iInsert, int nItemSize, const u8 *pItem, u8 *pLast) {
212673212673
int itemsToMove;
212674212674

212675212675
assert( nMaxSize > 0 && nItemSize > 0 );
@@ -212687,7 +212687,7 @@ void bufferInsert(void *aBuffer, int nSize, int nMaxSize, int iInsert, int nItem
212687212687
memcpy(aBuffer + iInsert * nItemSize, pItem, nItemSize);
212688212688
}
212689212689

212690-
void bufferDelete(void *aBuffer, int nSize, int iDelete, int nItemSize) {
212690+
void bufferDelete(u8 *aBuffer, int nSize, int iDelete, int nItemSize) {
212691212691
int itemsToMove;
212692212692

212693212693
assert( nItemSize > 0 );
@@ -212850,8 +212850,8 @@ static void diskAnnSearchCtxMarkVisited(DiskAnnSearchCtx *pCtx, DiskAnnNode *pNo
212850212850
if( iInsert < 0 ){
212851212851
return;
212852212852
}
212853-
bufferInsert(pCtx->aTopCandidates, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(DiskAnnNode*), &pNode, NULL);
212854-
bufferInsert(pCtx->aTopDistances, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(float), &distance, NULL);
212853+
bufferInsert((u8*)pCtx->aTopCandidates, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(DiskAnnNode*), (u8*)&pNode, NULL);
212854+
bufferInsert((u8*)pCtx->aTopDistances, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(float), (u8*)&distance, NULL);
212855212855
pCtx->nTopCandidates = MIN(pCtx->nTopCandidates + 1, pCtx->maxTopCandidates);
212856212856
}
212857212857

@@ -212872,17 +212872,17 @@ static void diskAnnSearchCtxDeleteCandidate(DiskAnnSearchCtx *pCtx, int iDelete)
212872212872
assert( pCtx->aCandidates[iDelete]->pBlobSpot == NULL );
212873212873

212874212874
diskAnnNodeFree(pCtx->aCandidates[iDelete]);
212875-
bufferDelete(pCtx->aCandidates, pCtx->nCandidates, iDelete, sizeof(DiskAnnNode*));
212876-
bufferDelete(pCtx->aDistances, pCtx->nCandidates, iDelete, sizeof(float));
212875+
bufferDelete((u8*)pCtx->aCandidates, pCtx->nCandidates, iDelete, sizeof(DiskAnnNode*));
212876+
bufferDelete((u8*)pCtx->aDistances, pCtx->nCandidates, iDelete, sizeof(float));
212877212877

212878212878
pCtx->nCandidates--;
212879212879
pCtx->nUnvisited--;
212880212880
}
212881212881

212882212882
static void diskAnnSearchCtxInsertCandidate(DiskAnnSearchCtx *pCtx, int iInsert, DiskAnnNode* pCandidate, float distance){
212883212883
DiskAnnNode *pLast = NULL;
212884-
bufferInsert(pCtx->aCandidates, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(DiskAnnNode*), &pCandidate, &pLast);
212885-
bufferInsert(pCtx->aDistances, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(float), &distance, NULL);
212884+
bufferInsert((u8*)pCtx->aCandidates, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(DiskAnnNode*), (u8*)&pCandidate, (u8*)&pLast);
212885+
bufferInsert((u8*)pCtx->aDistances, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(float), (u8*)&distance, NULL);
212886212886
pCtx->nCandidates = MIN(pCtx->nCandidates + 1, pCtx->maxCandidates);
212887212887
if( pLast != NULL && !pLast->visited ){
212888212888
// since pLast is not visited it should have uninitialized pBlobSpot - so it's safe to completely free the node

‎libsql-ffi/bundled/src/sqlite3.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212669,7 +212669,7 @@ int distanceBufferInsertIdx(const float *aDistances, int nSize, int nMaxSize, fl
212669212669
return nSize < nMaxSize ? nSize : -1;
212670212670
}
212671212671

212672-
void bufferInsert(void *aBuffer, int nSize, int nMaxSize, int iInsert, int nItemSize, const void *pItem, void *pLast) {
212672+
void bufferInsert(u8 *aBuffer, int nSize, int nMaxSize, int iInsert, int nItemSize, const u8 *pItem, u8 *pLast) {
212673212673
int itemsToMove;
212674212674

212675212675
assert( nMaxSize > 0 && nItemSize > 0 );
@@ -212687,7 +212687,7 @@ void bufferInsert(void *aBuffer, int nSize, int nMaxSize, int iInsert, int nItem
212687212687
memcpy(aBuffer + iInsert * nItemSize, pItem, nItemSize);
212688212688
}
212689212689

212690-
void bufferDelete(void *aBuffer, int nSize, int iDelete, int nItemSize) {
212690+
void bufferDelete(u8 *aBuffer, int nSize, int iDelete, int nItemSize) {
212691212691
int itemsToMove;
212692212692

212693212693
assert( nItemSize > 0 );
@@ -212850,8 +212850,8 @@ static void diskAnnSearchCtxMarkVisited(DiskAnnSearchCtx *pCtx, DiskAnnNode *pNo
212850212850
if( iInsert < 0 ){
212851212851
return;
212852212852
}
212853-
bufferInsert(pCtx->aTopCandidates, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(DiskAnnNode*), &pNode, NULL);
212854-
bufferInsert(pCtx->aTopDistances, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(float), &distance, NULL);
212853+
bufferInsert((u8*)pCtx->aTopCandidates, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(DiskAnnNode*), (u8*)&pNode, NULL);
212854+
bufferInsert((u8*)pCtx->aTopDistances, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(float), (u8*)&distance, NULL);
212855212855
pCtx->nTopCandidates = MIN(pCtx->nTopCandidates + 1, pCtx->maxTopCandidates);
212856212856
}
212857212857

@@ -212872,17 +212872,17 @@ static void diskAnnSearchCtxDeleteCandidate(DiskAnnSearchCtx *pCtx, int iDelete)
212872212872
assert( pCtx->aCandidates[iDelete]->pBlobSpot == NULL );
212873212873

212874212874
diskAnnNodeFree(pCtx->aCandidates[iDelete]);
212875-
bufferDelete(pCtx->aCandidates, pCtx->nCandidates, iDelete, sizeof(DiskAnnNode*));
212876-
bufferDelete(pCtx->aDistances, pCtx->nCandidates, iDelete, sizeof(float));
212875+
bufferDelete((u8*)pCtx->aCandidates, pCtx->nCandidates, iDelete, sizeof(DiskAnnNode*));
212876+
bufferDelete((u8*)pCtx->aDistances, pCtx->nCandidates, iDelete, sizeof(float));
212877212877

212878212878
pCtx->nCandidates--;
212879212879
pCtx->nUnvisited--;
212880212880
}
212881212881

212882212882
static void diskAnnSearchCtxInsertCandidate(DiskAnnSearchCtx *pCtx, int iInsert, DiskAnnNode* pCandidate, float distance){
212883212883
DiskAnnNode *pLast = NULL;
212884-
bufferInsert(pCtx->aCandidates, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(DiskAnnNode*), &pCandidate, &pLast);
212885-
bufferInsert(pCtx->aDistances, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(float), &distance, NULL);
212884+
bufferInsert((u8*)pCtx->aCandidates, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(DiskAnnNode*), (u8*)&pCandidate, (u8*)&pLast);
212885+
bufferInsert((u8*)pCtx->aDistances, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(float), (u8*)&distance, NULL);
212886212886
pCtx->nCandidates = MIN(pCtx->nCandidates + 1, pCtx->maxCandidates);
212887212887
if( pLast != NULL && !pLast->visited ){
212888212888
// since pLast is not visited it should have uninitialized pBlobSpot - so it's safe to completely free the node

‎libsql-sqlite3/src/vectordiskann.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ int distanceBufferInsertIdx(const float *aDistances, int nSize, int nMaxSize, fl
913913
return nSize < nMaxSize ? nSize : -1;
914914
}
915915

916-
void bufferInsert(void *aBuffer, int nSize, int nMaxSize, int iInsert, int nItemSize, const void *pItem, void *pLast) {
916+
void bufferInsert(u8 *aBuffer, int nSize, int nMaxSize, int iInsert, int nItemSize, const u8 *pItem, u8 *pLast) {
917917
int itemsToMove;
918918

919919
assert( nMaxSize > 0 && nItemSize > 0 );
@@ -931,7 +931,7 @@ void bufferInsert(void *aBuffer, int nSize, int nMaxSize, int iInsert, int nItem
931931
memcpy(aBuffer + iInsert * nItemSize, pItem, nItemSize);
932932
}
933933

934-
void bufferDelete(void *aBuffer, int nSize, int iDelete, int nItemSize) {
934+
void bufferDelete(u8 *aBuffer, int nSize, int iDelete, int nItemSize) {
935935
int itemsToMove;
936936

937937
assert( nItemSize > 0 );
@@ -1094,8 +1094,8 @@ static void diskAnnSearchCtxMarkVisited(DiskAnnSearchCtx *pCtx, DiskAnnNode *pNo
10941094
if( iInsert < 0 ){
10951095
return;
10961096
}
1097-
bufferInsert(pCtx->aTopCandidates, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(DiskAnnNode*), &pNode, NULL);
1098-
bufferInsert(pCtx->aTopDistances, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(float), &distance, NULL);
1097+
bufferInsert((u8*)pCtx->aTopCandidates, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(DiskAnnNode*), (u8*)&pNode, NULL);
1098+
bufferInsert((u8*)pCtx->aTopDistances, pCtx->nTopCandidates, pCtx->maxTopCandidates, iInsert, sizeof(float), (u8*)&distance, NULL);
10991099
pCtx->nTopCandidates = MIN(pCtx->nTopCandidates + 1, pCtx->maxTopCandidates);
11001100
}
11011101

@@ -1116,17 +1116,17 @@ static void diskAnnSearchCtxDeleteCandidate(DiskAnnSearchCtx *pCtx, int iDelete)
11161116
assert( pCtx->aCandidates[iDelete]->pBlobSpot == NULL );
11171117

11181118
diskAnnNodeFree(pCtx->aCandidates[iDelete]);
1119-
bufferDelete(pCtx->aCandidates, pCtx->nCandidates, iDelete, sizeof(DiskAnnNode*));
1120-
bufferDelete(pCtx->aDistances, pCtx->nCandidates, iDelete, sizeof(float));
1119+
bufferDelete((u8*)pCtx->aCandidates, pCtx->nCandidates, iDelete, sizeof(DiskAnnNode*));
1120+
bufferDelete((u8*)pCtx->aDistances, pCtx->nCandidates, iDelete, sizeof(float));
11211121

11221122
pCtx->nCandidates--;
11231123
pCtx->nUnvisited--;
11241124
}
11251125

11261126
static void diskAnnSearchCtxInsertCandidate(DiskAnnSearchCtx *pCtx, int iInsert, DiskAnnNode* pCandidate, float distance){
11271127
DiskAnnNode *pLast = NULL;
1128-
bufferInsert(pCtx->aCandidates, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(DiskAnnNode*), &pCandidate, &pLast);
1129-
bufferInsert(pCtx->aDistances, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(float), &distance, NULL);
1128+
bufferInsert((u8*)pCtx->aCandidates, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(DiskAnnNode*), (u8*)&pCandidate, (u8*)&pLast);
1129+
bufferInsert((u8*)pCtx->aDistances, pCtx->nCandidates, pCtx->maxCandidates, iInsert, sizeof(float), (u8*)&distance, NULL);
11301130
pCtx->nCandidates = MIN(pCtx->nCandidates + 1, pCtx->maxCandidates);
11311131
if( pLast != NULL && !pLast->visited ){
11321132
// since pLast is not visited it should have uninitialized pBlobSpot - so it's safe to completely free the node

0 commit comments

Comments
 (0)