From cdd544c4a2f767fe57a9ca2fe41808104abdaeb7 Mon Sep 17 00:00:00 2001 From: stephengold Date: Mon, 8 Jun 2026 15:18:10 -0700 Subject: [PATCH] glue: eliminate ifndef WIN32 --- src/main/native/glue/j/JobSystemSingleThreaded.cpp | 5 +---- src/main/native/glue/j/JobSystemThreadPool.cpp | 5 +---- src/main/native/glue/t/TempAllocatorMalloc.cpp | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/native/glue/j/JobSystemSingleThreaded.cpp b/src/main/native/glue/j/JobSystemSingleThreaded.cpp index 7cd06b51f..2e195339a 100644 --- a/src/main/native/glue/j/JobSystemSingleThreaded.cpp +++ b/src/main/native/glue/j/JobSystemSingleThreaded.cpp @@ -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 @@ -53,8 +53,5 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_JobSystemSingleThread JobSystemSingleThreaded * const pSystem = reinterpret_cast (systemVa); TRACE_DELETE("JobSystemSingleThreaded", pSystem) -#ifndef WIN32 - // Attempting to delete a JobSystemSingleThreaded on Windows causes deadlock! delete pSystem; -#endif } \ No newline at end of file diff --git a/src/main/native/glue/j/JobSystemThreadPool.cpp b/src/main/native/glue/j/JobSystemThreadPool.cpp index 582816c88..f4c4ea6e8 100644 --- a/src/main/native/glue/j/JobSystemThreadPool.cpp +++ b/src/main/native/glue/j/JobSystemThreadPool.cpp @@ -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 @@ -52,10 +52,7 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_JobSystemThreadPool_f (JNIEnv *, jclass, jlong systemVa) { const JobSystem * const pSystem = reinterpret_cast (systemVa); TRACE_DELETE("JobSystem", pSystem) -#ifndef WIN32 - // Attempting to delete a JobSystemThreadPool on Windows causes deadlock! delete pSystem; -#endif } /* diff --git a/src/main/native/glue/t/TempAllocatorMalloc.cpp b/src/main/native/glue/t/TempAllocatorMalloc.cpp index 6d82004fb..b6ba15306 100644 --- a/src/main/native/glue/t/TempAllocatorMalloc.cpp +++ b/src/main/native/glue/t/TempAllocatorMalloc.cpp @@ -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 @@ -61,8 +61,5 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_TempAllocatorMalloc_f const TempAllocatorMalloc * const pAllocator = reinterpret_cast (allocatorVa); TRACE_DELETE("TempAllocatorMalloc", pAllocator) -#ifndef WIN32 - // Attempting to delete a TempAllocatorMalloc on Windows causes deadlock! delete pAllocator; -#endif } \ No newline at end of file