Adapt to GlueGen commit c3054a01990e55ab35756ea23ab7d7c05f24dd37 (compount call-by-value extension)

2 files changed, 4 insertions, 0 deletions

diff --git a/make/config/cl-impl.cfg b/make/config/cl-impl.cfg
index a7b53950..4444b267 100644
--- a/make/config/cl-impl.cfg
+++ b/make/config/cl-impl.cfg
@@ -93,5 +93,6 @@ ForceProcAddressGen clEnqueueMapImage
 
 #include custom code
 IncludeAs CustomJavaCode CLAbstractImpl clImplCustomCode.java
+ManualStaticInit CLAbstractImpl
 IncludeAs CustomCCode clImplCustomCode.c
 
diff --git a/make/config/clImplCustomCode.java b/make/config/clImplCustomCode.java
index 6c407110..f57995d1 100644
--- a/make/config/clImplCustomCode.java
+++ b/make/config/clImplCustomCode.java
@@ -19,6 +19,9 @@
                                           return null;
                                       }
                                       addressTable.reset(bundle);
+                                      if( !initializeImpl() ) {
+                                          throw new RuntimeException("Initialization failure");
+                                      }                                      
                                       return bundle;
                                   } } );
     }