Merge branch 'master' of https://github.com/google/flatbuffers into grpc2

This commit is contained in:
Wouter van Oortmerssen
2016-07-20 17:41:36 -07:00
36 changed files with 751 additions and 102 deletions

View File

@@ -8,8 +8,8 @@ public final class EnumInNestedNS {
public static final byte B = 1;
public static final byte C = 2;
private static final String[] names = { "A", "B", "C", };
public static final String[] names = { "A", "B", "C", };
public static String name(int e) { return names[e]; }
};
}

View File

@@ -22,5 +22,5 @@ public final class StructInNestedNS extends Struct {
builder.putInt(a);
return builder.offset();
}
};
}

View File

@@ -29,5 +29,5 @@ public final class TableInNestedNS extends Table {
int o = builder.endObject();
return o;
}
};
}

View File

@@ -29,5 +29,5 @@ public final class SecondTableInA extends Table {
int o = builder.endObject();
return o;
}
};
}

View File

@@ -28,5 +28,5 @@ public final class TableInFirstNS extends Table {
int o = builder.endObject();
return o;
}
};
}

View File

@@ -34,5 +34,5 @@ public final class TableInC extends Table {
int o = builder.endObject();
return o;
}
};
}