Updated Branches: refs/heads/trunk ef2333590 -> 5f184a04a
don't mask class level template parameter 'T' Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f184a04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f184a04 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f184a04 Branch: refs/heads/trunk Commit: 5f184a04ad1f8dc52b55b0a82081da61140d6d81 Parents: ef23335 Author: Dave Brosius <[email protected]> Authored: Sun Jul 29 11:43:54 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun Jul 29 11:44:53 2012 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/dht/Token.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f184a04/src/java/org/apache/cassandra/dht/Token.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/Token.java b/src/java/org/apache/cassandra/dht/Token.java index b000775..2aeafbd 100644 --- a/src/java/org/apache/cassandra/dht/Token.java +++ b/src/java/org/apache/cassandra/dht/Token.java @@ -165,12 +165,12 @@ public abstract class Token<T> implements RingPosition<Token<T>>, Serializable return maxKeyBound(StorageService.getPartitioner()); } - public <T extends RingPosition> T upperBound(Class<T> klass) + public <R extends RingPosition> R upperBound(Class<R> klass) { if (klass.equals(getClass())) - return (T)this; + return (R)this; else - return (T)maxKeyBound(); + return (R)maxKeyBound(); } public static class KeyBound extends RowPosition
