Skip to content

glue: eliminate ifndef WIN32 #48

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
stephengold merged 1 commit into from
Jun 8, 2026
+3 −12
Merged

glue: eliminate ifndef WIN32 #48

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
5 changes: 1 addition & 4 deletions src/main/native/glue/j/JobSystemSingleThreaded.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2024 Stephen Gold
Copyright (c) 2024-2026 Stephen Gold

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -53,8 +53,5 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_JobSystemSingleThread
JobSystemSingleThreaded * const pSystem
= reinterpret_cast<JobSystemSingleThreaded *> (systemVa);
TRACE_DELETE("JobSystemSingleThreaded", pSystem)
#ifndef WIN32
// Attempting to delete a JobSystemSingleThreaded on Windows causes deadlock!
delete pSystem;
#endif
}
5 changes: 1 addition & 4 deletions src/main/native/glue/j/JobSystemThreadPool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2024 Stephen Gold
Copyright (c) 2024-2026 Stephen Gold

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -52,10 +52,7 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_JobSystemThreadPool_f
(JNIEnv *, jclass, jlong systemVa) {
const JobSystem * const pSystem = reinterpret_cast<JobSystem *> (systemVa);
TRACE_DELETE("JobSystem", pSystem)
#ifndef WIN32
// Attempting to delete a JobSystemThreadPool on Windows causes deadlock!
delete pSystem;
#endif
}

/*
Expand Down
5 changes: 1 addition & 4 deletions src/main/native/glue/t/TempAllocatorMalloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2024-2025 Stephen Gold
Copyright (c) 2024-2026 Stephen Gold

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -61,8 +61,5 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_TempAllocatorMalloc_f
const TempAllocatorMalloc * const pAllocator
= reinterpret_cast<TempAllocatorMalloc *> (allocatorVa);
TRACE_DELETE("TempAllocatorMalloc", pAllocator)
#ifndef WIN32
// Attempting to delete a TempAllocatorMalloc on Windows causes deadlock!
delete pAllocator;
#endif
}
Loading