aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/LocklessQueue.cs
diff options
context:
space:
mode:
authorMelanie2013-01-19 21:49:33 +0100
committerMelanie2013-01-19 21:49:33 +0100
commit2d3a57a002c74704501f4ce0f0359f2a19699eb5 (patch)
treecc74ca02d7b8f8c9e63e4007c354f3296fe87392 /OpenSim/Framework/LocklessQueue.cs
parentMerge branch 'master' into careminster (diff)
parentRemove group IM test code also mentioning "OpenSimulator Testing" (diff)
downloadopensim-SC_OLD-2d3a57a002c74704501f4ce0f0359f2a19699eb5.zip
opensim-SC_OLD-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.gz
opensim-SC_OLD-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.bz2
opensim-SC_OLD-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.xz
Merge branch 'avination'
Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
Diffstat (limited to 'OpenSim/Framework/LocklessQueue.cs')
-rw-r--r--OpenSim/Framework/LocklessQueue.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/LocklessQueue.cs b/OpenSim/Framework/LocklessQueue.cs
index 84f887c..9bd9baf 100644
--- a/OpenSim/Framework/LocklessQueue.cs
+++ b/OpenSim/Framework/LocklessQueue.cs
@@ -29,7 +29,7 @@ using System.Threading;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 public sealed class LocklessQueue<T> 32 public class LocklessQueue<T>
33 { 33 {
34 private sealed class SingleLinkNode 34 private sealed class SingleLinkNode
35 { 35 {
@@ -41,7 +41,7 @@ namespace OpenSim.Framework
41 SingleLinkNode tail; 41 SingleLinkNode tail;
42 int count; 42 int count;
43 43
44 public int Count { get { return count; } } 44 public virtual int Count { get { return count; } }
45 45
46 public LocklessQueue() 46 public LocklessQueue()
47 { 47 {
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
76 Interlocked.Increment(ref count); 76 Interlocked.Increment(ref count);
77 } 77 }
78 78
79 public bool Dequeue(out T item) 79 public virtual bool Dequeue(out T item)
80 { 80 {
81 item = default(T); 81 item = default(T);
82 SingleLinkNode oldHead = null; 82 SingleLinkNode oldHead = null;
@@ -136,4 +136,4 @@ namespace OpenSim.Framework
136 (object)Interlocked.CompareExchange<SingleLinkNode>(ref location, newValue, comparand); 136 (object)Interlocked.CompareExchange<SingleLinkNode>(ref location, newValue, comparand);
137 } 137 }
138 } 138 }
139} \ No newline at end of file 139}