diff options
author | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
commit | 69fe372b874d913e2d1c27f1d103e1fced668ecf (patch) | |
tree | cf402337903ba3d02bbab628f2f82a23908a5f11 /test | |
parent | 2138fc787c1e497be7f373aa68b3f751c955008f (diff) | |
parent | 2d76c16b9384d383d3e6a9d7cb727f2591a39228 (diff) |
Resolved conflicts
Diffstat (limited to 'test')
-rw-r--r-- | test/junit/com/sun/gluegen/BasicTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/junit/com/sun/gluegen/BasicTest.java b/test/junit/com/sun/gluegen/BasicTest.java index c09fe60..a12cc76 100644 --- a/test/junit/com/sun/gluegen/BasicTest.java +++ b/test/junit/com/sun/gluegen/BasicTest.java @@ -1,6 +1,6 @@ package com.sun.gluegen; -import com.jogamp.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.Buffers; import com.jogamp.gluegen.runtime.PointerBuffer; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -55,7 +55,7 @@ public class BasicTest { // TODO fix Exception: ...Caused by: java.lang.UnsatisfiedLinkError: test.BindingTest.arrayTest0(JLjava/lang/Object;I)I /* // test values - ByteBuffer dbb = BufferFactory.newDirectByteBuffer(32); + ByteBuffer dbb = Buffers.newDirectByteBuffer(32); ByteBuffer bb = ByteBuffer.allocate(32).order(ByteOrder.nativeOrder()); PointerBuffer dpb = PointerBuffer.allocateDirect(32); |