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 /src/java/com/sun/gluegen/test | |
| parent | 2138fc787c1e497be7f373aa68b3f751c955008f (diff) | |
| parent | 2d76c16b9384d383d3e6a9d7cb727f2591a39228 (diff) | |
Resolved conflicts
Diffstat (limited to 'src/java/com/sun/gluegen/test')
| -rw-r--r-- | src/java/com/sun/gluegen/test/TestPointerBufferEndian.java | 2 | ||||
| -rw-r--r-- | src/java/com/sun/gluegen/test/TestStructAccessorEndian.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java b/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java index 9377de7..96e4e87 100644 --- a/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java +++ b/src/java/com/sun/gluegen/test/TestPointerBufferEndian.java @@ -14,7 +14,7 @@ public class TestPointerBufferEndian { String cpu = System.getProperty("os.arch"); System.out.println("OS: <"+os+"> CPU: <"+cpu+"> Bits: <"+bitsPtr+"/"+bitsProp+">"); System.out.println("CPU is: "+ (Platform.is32Bit()?"32":"64") + " bit"); - System.out.println("Buffer is in: "+ (BufferFactory.isLittleEndian()?"little":"big") + " endian"); + System.out.println("Buffer is in: "+ (Platform.isLittleEndian()?"little":"big") + " endian"); PointerBuffer ptr = direct ? PointerBuffer.allocateDirect(3) : PointerBuffer.allocate(3); ptr.put(0, 0x0123456789ABCDEFL); ptr.put(1, 0x8877665544332211L); diff --git a/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java b/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java index 9d288b4..7202056 100644 --- a/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java +++ b/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java @@ -13,8 +13,8 @@ public class TestStructAccessorEndian { String cpu = System.getProperty("os.arch"); System.out.println("OS: <"+os+"> CPU: <"+cpu+"> Bits: <"+bitsPtr+"/"+bitsProp+">"); System.out.println("CPU is: "+ (Platform.is32Bit()?"32":"64") + " bit"); - System.out.println("Buffer is in: "+ (BufferFactory.isLittleEndian()?"little":"big") + " endian"); - ByteBuffer tst = BufferFactory.newDirectByteBuffer(BufferFactory.SIZEOF_LONG * 3); + System.out.println("Buffer is in: "+ (Platform.isLittleEndian()?"little":"big") + " endian"); + ByteBuffer tst = Buffers.newDirectByteBuffer(Buffers.SIZEOF_LONG * 3); StructAccessor acc = new StructAccessor(tst); acc.setLongAt(0, 0x0123456789ABCDEFL); acc.setLongAt(1, 0x8877665544332211L); |