summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--src/clpp11.hpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 345bab2a..3fe3208e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ Development version (next version)
- Fixed a bug in XAMAX/XAMIN routines that would cause only the real part of a complex number to be taken into account
- Fixed a bug that caused tests to not properly do integer-output testing (for XAMAX/XAMIN)
- Fixes a minor issue with the expected input buffer size in the TRMV/TBMV/TPMV/TRSV routines
+- Fixes an issue with crashes on Android related to calling clReleaseProgram
- Fixes two small issues in the plotting script
- Fixed a documentation bug in the 'ld' requirements
- Added tuned parameters for various devices (see doc/tuning.md)
diff --git a/src/clpp11.hpp b/src/clpp11.hpp
index e5b8b4a7..3fb89f5e 100644
--- a/src/clpp11.hpp
+++ b/src/clpp11.hpp
@@ -487,7 +487,8 @@ class Program {
// Clean-up
~Program() {
- #ifndef _MSC_VER // causes an access violation under Windows when the driver is already unloaded
+ // Causes an access violation under Windows or Android when the driver is already unloaded
+ #if !defined(__ANDROID__) && !defined(_MSC_VER)
if (program_) { CheckErrorDtor(clReleaseProgram(program_)); }
#endif
}