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

- initializeImpl() is no more required, since it's not forced .. uncomment in manual static initializer

2 files changed, 3 insertions, 2 deletions

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