You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by mh...@apache.org on 2013/09/24 20:32:52 UTC
[16/50] [abbrv] Massive cleanup, reducing compiler errors
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/80561f72/src/core/Util/Packed/BlockPackedWriter.cs
----------------------------------------------------------------------
diff --git a/src/core/Util/Packed/BlockPackedWriter.cs b/src/core/Util/Packed/BlockPackedWriter.cs
index 139c68e..9564e34 100644
--- a/src/core/Util/Packed/BlockPackedWriter.cs
+++ b/src/core/Util/Packed/BlockPackedWriter.cs
@@ -13,7 +13,7 @@ namespace Lucene.Net.Util.Packed
{
}
- protected void Flush()
+ protected override void Flush()
{
//assert off > 0;
long min = long.MaxValue, max = long.MinValue;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/80561f72/src/core/Util/Packed/MonotonicAppendingLongBuffer.cs
----------------------------------------------------------------------
diff --git a/src/core/Util/Packed/MonotonicAppendingLongBuffer.cs b/src/core/Util/Packed/MonotonicAppendingLongBuffer.cs
index e4f517b..0ee7421 100644
--- a/src/core/Util/Packed/MonotonicAppendingLongBuffer.cs
+++ b/src/core/Util/Packed/MonotonicAppendingLongBuffer.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.Util.Packed
averages = new float[16];
}
- internal long Get(int block, int element)
+ internal override long Get(int block, int element)
{
if (block == valuesOff)
{
@@ -88,7 +88,7 @@ namespace Lucene.Net.Util.Packed
}
}
- public Iterator GetIterator()
+ internal override AbstractAppendingLongBuffer.Iterator GetIterator()
{
return new Iterator(this);
}
@@ -102,7 +102,7 @@ namespace Lucene.Net.Util.Packed
this.parent = parent;
}
- internal void FillValues()
+ internal override void FillValues()
{
if (vOff == parent.valuesOff)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/80561f72/src/core/Util/Packed/Packed64SingleBlock.cs
----------------------------------------------------------------------
diff --git a/src/core/Util/Packed/Packed64SingleBlock.cs b/src/core/Util/Packed/Packed64SingleBlock.cs
index b01d064..b41cb14 100644
--- a/src/core/Util/Packed/Packed64SingleBlock.cs
+++ b/src/core/Util/Packed/Packed64SingleBlock.cs
@@ -8,7 +8,7 @@ using Lucene.Net.Support;
namespace Lucene.Net.Util.Packed
{
- public class Packed64SingleBlock : PackedInts.Mutable
+ public abstract class Packed64SingleBlock : PackedInts.Mutable
{
public const int MAX_SUPPORTED_BITS_PER_VALUE = 32;
@@ -184,9 +184,12 @@ namespace Lucene.Net.Util.Packed
}
- protected override PackedInts.Format GetFormat()
+ protected override PackedInts.Format Format
{
- return PackedInts.Format.PACKED_SINGLE_BLOCK;
+ get
+ {
+ return PackedInts.Format.PACKED_SINGLE_BLOCK;
+ }
}
public override String ToString()
@@ -521,7 +524,7 @@ namespace Lucene.Net.Util.Packed
{
}
- public long Get(int index)
+ public override long Get(int index)
{
int o = Number.URShift(index, 2);
int b = index & 3;
@@ -529,7 +532,7 @@ namespace Lucene.Net.Util.Packed
return Number.URShift(blocks[o], shift) & 65535L;
}
- public void Set(int index, long value)
+ public override void Set(int index, long value)
{
int o = Number.URShift(index, 2);
int b = index & 3;
@@ -585,5 +588,9 @@ namespace Lucene.Net.Util.Packed
blocks[o] = (blocks[o] & ~(4294967295L << shift)) | (value << shift);
}
}
+
+ public abstract override void Set(int index, long value);
+
+ public abstract override long Get(int index);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/80561f72/src/core/Util/RollingBuffer.cs
----------------------------------------------------------------------
diff --git a/src/core/Util/RollingBuffer.cs b/src/core/Util/RollingBuffer.cs
index 0534d02..3ae2980 100644
--- a/src/core/Util/RollingBuffer.cs
+++ b/src/core/Util/RollingBuffer.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Util
protected abstract T NewInstance();
- public void Reset()
+ public virtual void Reset()
{
nextWrite--;
while (count > 0)