Skip to content

Commit cdd544c

Browse files
committed
glue: eliminate ifndef WIN32
1 parent 1639c4b commit cdd544c

3 files changed

Lines changed: 3 additions & 12 deletions

File tree

src/main/native/glue/j/JobSystemSingleThreaded.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2024 Stephen Gold
2+
Copyright (c) 2024-2026 Stephen Gold
33
44
Permission is hereby granted, free of charge, to any person obtaining a copy
55
of this software and associated documentation files (the "Software"), to deal
@@ -53,8 +53,5 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_JobSystemSingleThread
5353
JobSystemSingleThreaded * const pSystem
5454
= reinterpret_cast<JobSystemSingleThreaded *> (systemVa);
5555
TRACE_DELETE("JobSystemSingleThreaded", pSystem)
56-
#ifndef WIN32
57-
// Attempting to delete a JobSystemSingleThreaded on Windows causes deadlock!
5856
delete pSystem;
59-
#endif
6057
}

src/main/native/glue/j/JobSystemThreadPool.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2024 Stephen Gold
2+
Copyright (c) 2024-2026 Stephen Gold
33
44
Permission is hereby granted, free of charge, to any person obtaining a copy
55
of this software and associated documentation files (the "Software"), to deal
@@ -52,10 +52,7 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_JobSystemThreadPool_f
5252
(JNIEnv *, jclass, jlong systemVa) {
5353
const JobSystem * const pSystem = reinterpret_cast<JobSystem *> (systemVa);
5454
TRACE_DELETE("JobSystem", pSystem)
55-
#ifndef WIN32
56-
// Attempting to delete a JobSystemThreadPool on Windows causes deadlock!
5755
delete pSystem;
58-
#endif
5956
}
6057

6158
/*

src/main/native/glue/t/TempAllocatorMalloc.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2024-2025 Stephen Gold
2+
Copyright (c) 2024-2026 Stephen Gold
33
44
Permission is hereby granted, free of charge, to any person obtaining a copy
55
of this software and associated documentation files (the "Software"), to deal
@@ -61,8 +61,5 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_TempAllocatorMalloc_f
6161
const TempAllocatorMalloc * const pAllocator
6262
= reinterpret_cast<TempAllocatorMalloc *> (allocatorVa);
6363
TRACE_DELETE("TempAllocatorMalloc", pAllocator)
64-
#ifndef WIN32
65-
// Attempting to delete a TempAllocatorMalloc on Windows causes deadlock!
6664
delete pAllocator;
67-
#endif
6865
}

0 commit comments

Comments
 (0)