Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Jiang-Weibo/ncnn
Browse files Browse the repository at this point in the history
  • Loading branch information
s2496214 committed Sep 7, 2024
2 parents c437990 + 20424ae commit 6a91ebb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/simpleomp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class KMPTask
int argc;
void** argv;
#elif _WIN32
// vcomp abi
// vcomp abi
void (*fn)(void*);
int argc;
void** argv;
Expand Down Expand Up @@ -845,7 +845,7 @@ void CDECL _vcomp_fork_call_wrapper(void* wrapper, int nargs, void** args)
}

void CDECL _vcomp_for_static_simple_init(unsigned int first, unsigned int last, int step,
BOOL increment, unsigned int* begin, unsigned int* end)
BOOL increment, unsigned int* begin, unsigned int* end)
{
unsigned int iterations, per_thread, remaining;
int num_threads = omp_get_num_threads();
Expand Down Expand Up @@ -893,7 +893,7 @@ void CDECL _vcomp_for_static_simple_init(unsigned int first, unsigned int last,
}

void CDECL _vcomp_for_static_simple_init_i8(ULONG64 first, ULONG64 last, LONG64 step,
BOOL increment, ULONG64* begin, ULONG64* end)
BOOL increment, ULONG64* begin, ULONG64* end)
{
ULONG64 iterations, per_thread, remaining;
int num_threads = omp_get_num_threads();
Expand Down Expand Up @@ -955,7 +955,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void* wrapper, ...)
// for nested parallel region feature, not supported here
if (!ifval)
num_threads = 1;

// build argv
void* argv[32];
{
Expand Down

0 comments on commit 6a91ebb

Please sign in to comment.