Skip to content

Commit 6af51f6

Browse files
committedDec 3, 2016
Fixed some bugs where the wrong directory structure was referenced.
1 parent 6059f2c commit 6af51f6

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ hs_err_pid*
2828
**/dist/
2929
**/include/
3030
**/nbproject/
31+
**/.idea/
3132

3233
*.iml
3334

‎src/cpp/JNIHelper.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
#include "CLException.h"
4545
#define JavaLangPackage(name) "java/lang/" name
4646
#define JavaUtilPackage(name) "java/util/" name
47-
#define AparapiPackage(name) "com/aparapi/aparapi/" name
48-
#define AparapiDevicePackage(name) "com/aparapi/aparapi/device/" name
49-
#define AparapiOpenCLPackage(name) "com/aparapi/aparapi/internal/opencl/" name
50-
#define AparapiUtilPackage(name) "com/aparapi/aparapi/internal/util/" name
47+
#define AparapiPackage(name) "com/aparapi/" name
48+
#define AparapiDevicePackage(name) "com/aparapi/device/" name
49+
#define AparapiOpenCLPackage(name) "com/aparapi/internal/opencl/" name
50+
#define AparapiUtilPackage(name) "com/aparapi/internal/util/" name
5151

5252
#define ProfileInfoClass AparapiPackage("ProfileInfo")
5353
#define OpenCLKernelClass AparapiOpenCLPackage("OpenCLKernel")

‎src/cpp/classtools.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ bool isKernel(char *_className, ByteBuffer *_byteBuffer){
553553
ClassConstantPoolEntry *superClassConstantPoolEntry = (ClassConstantPoolEntry*)constantPool[superClassConstantPoolIndex];
554554
UTF8ConstantPoolEntry *superClassUTF8ConstantPoolEntry = (UTF8ConstantPoolEntry*)constantPool[superClassConstantPoolEntry->getNameIndex()];
555555

556-
isAKernel= !strcmp((char *)(superClassUTF8ConstantPoolEntry->getUTF8Bytes()),"com/aparapi/aparapi/Kernel");
556+
isAKernel= !strcmp((char *)(superClassUTF8ConstantPoolEntry->getUTF8Bytes()),"com/aparapi/Kernel");
557557

558558
#ifdef SHOW
559559
fprintf(stdout, "Class name at super index is \"%s\"\n", superClassUTF8ConstantPoolEntry->getUTF8Bytes());

‎src/cpp/runKernel/Config.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jboolean Config::getBoolean(JNIEnv *jenv, const char *fieldName){
4545

4646
Config::Config(JNIEnv *jenv){
4747
enableVerboseJNI = false;
48-
configClass = jenv->FindClass("com/aparapi/aparapi/internal/jni/ConfigJNI");
48+
configClass = jenv->FindClass("com/aparapi/internal/jni/ConfigJNI");
4949
if (configClass == NULL || jenv->ExceptionCheck()) {
5050
jenv->ExceptionDescribe();
5151
jenv->ExceptionClear();

0 commit comments

Comments
 (0)
Please sign in to comment.