Resolved conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java b/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java
index 8e30ed8..a89dace 100644
--- a/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java
+++ b/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java
@@ -62,9 +62,9 @@ public abstract class PointerBuffer {
 
     public static PointerBuffer allocateDirect(int size) {
         if (Platform.isJavaSE()) {
-            return new PointerBufferSE(BufferFactory.newDirectByteBuffer(elementSize() * size));
+            return new PointerBufferSE(Buffers.newDirectByteBuffer(elementSize() * size));
         } else {
-            return new PointerBufferME_CDC_FP(BufferFactory.newDirectByteBuffer(elementSize() * size));
+            return new PointerBufferME_CDC_FP(Buffers.newDirectByteBuffer(elementSize() * size));
         }
     }
 
@@ -91,7 +91,7 @@ public abstract class PointerBuffer {
     }
 
     public static int elementSize() {
-        return Platform.is32Bit() ? BufferFactory.SIZEOF_INT : BufferFactory.SIZEOF_LONG;
+        return Platform.is32Bit() ? Buffers.SIZEOF_INT : Buffers.SIZEOF_LONG;
     }
 
     public int limit() {