From e81d28c979edfcd93d2a4f779502702d4567dba8 Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Sat, 17 May 2014 15:15:18 -0400
Subject: [PATCH] remove WordPointer

---
 .../src/main/java/org/capnproto/MessageReader.java  |  3 +--
 .../src/main/java/org/capnproto/PointerReader.java  |  4 ++--
 .../src/main/java/org/capnproto/WordPointer.java    | 13 -------------
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 generator/src/main/java/org/capnproto/WordPointer.java

diff --git a/generator/src/main/java/org/capnproto/MessageReader.java b/generator/src/main/java/org/capnproto/MessageReader.java
index 1337184..2248638 100644
--- a/generator/src/main/java/org/capnproto/MessageReader.java
+++ b/generator/src/main/java/org/capnproto/MessageReader.java
@@ -11,8 +11,7 @@ public class MessageReader {
 
     public <T> T getRoot(FromStructReader<T> factory) {
         SegmentReader segment = new SegmentReader(this.segmentSlices[0]);
-        PointerReader pointerReader = PointerReader.getRoot(segment,
-                                                            new WordPointer(this.segmentSlices[0], 0),
+        PointerReader pointerReader = PointerReader.getRoot(segment, 0,
                                                             0x7fffffff /* XXX */);
         AnyPointer.Reader any = new AnyPointer.Reader(pointerReader);
         return any.getAsStruct(factory);
diff --git a/generator/src/main/java/org/capnproto/PointerReader.java b/generator/src/main/java/org/capnproto/PointerReader.java
index 8f2e27c..dd75ce0 100644
--- a/generator/src/main/java/org/capnproto/PointerReader.java
+++ b/generator/src/main/java/org/capnproto/PointerReader.java
@@ -18,10 +18,10 @@ public class PointerReader {
     }
 
     public static PointerReader getRoot(SegmentReader segment,
-                                        WordPointer location,
+                                        int location,
                                         int nestingLimit) {
         // TODO bounds check
-        return new PointerReader(segment, location.offset, nestingLimit);
+        return new PointerReader(segment, location, nestingLimit);
     }
 
     public boolean isNull() {
diff --git a/generator/src/main/java/org/capnproto/WordPointer.java b/generator/src/main/java/org/capnproto/WordPointer.java
deleted file mode 100644
index 8ba7f20..0000000
--- a/generator/src/main/java/org/capnproto/WordPointer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.capnproto;
-
-import java.nio.ByteBuffer;
-
-class WordPointer {
-    public final ByteBuffer buffer;
-    public int offset; // in words
-
-    public WordPointer(ByteBuffer buffer, int offset) {
-        this.buffer = buffer;
-        this.offset = offset;
-    }
-}