Mercurial > hg > truffle
diff src/os/linux/vm/gpu_linux.cpp @ 15182:89325b6051ea
Merge
author | Matthias Grimmer <grimmer@ssw.jku.at> |
---|---|
date | Thu, 17 Apr 2014 08:22:21 +0200 |
parents | 66e3af78ea96 |
children |
line wrap: on
line diff
--- a/src/os/linux/vm/gpu_linux.cpp Wed Apr 16 17:55:12 2014 +0200 +++ b/src/os/linux/vm/gpu_linux.cpp Thu Apr 17 08:22:21 2014 +0200 @@ -38,7 +38,7 @@ #define PCI_DRIVER_NAME_START_POS 255 -jobject gpu::probe_gpus(JNIEnv* env) { +jobject Gpu::probe_gpus(JNIEnv* env) { bool hsail = false; bool ptx = false;