Refactor OperationCanceledException to be more inline with the style of handling name conflicts (i.e. it already exists in System, so move it to System.Couchbase)

Author: borrrden

System.Threading.Tasks/Task.cs

@@ -440,7 +440,7 @@ void ThreadStart ()
 
 				try {
 				    InnerInvoke ();
-				} catch (OperationCanceledException_ oce) {
+                } catch (System.Couchbase.OperationCanceledException oce) {
 					if (token != CancellationToken.None && oce.CancellationToken == token)
 						CancelReal ();
 					else

System.Threading.Tasks/TaskCanceledException.cs

@@ -28,7 +28,7 @@
 namespace System.Threading.Tasks
 {
 	[Serializable]
-	public class TaskCanceledException : OperationCanceledException_
+    public class TaskCanceledException : System.Couchbase.OperationCanceledException
 	{
 		readonly Task task;
 

System.Threading/CancellationToken.cs

@@ -84,7 +84,7 @@ public CancellationTokenRegistration Register (Action<object> callback, object s
 		public void ThrowIfCancellationRequested ()
 		{
 			if (source != null && source.IsCancellationRequested)
-				throw new OperationCanceledException_ (this);
+                throw new System.Couchbase.OperationCanceledException (this);
 		}
 
 		public bool Equals (CancellationToken other)

System.Threading/ManualResetEventSlim.cs

@@ -185,7 +185,7 @@ public bool Wait (int millisecondsTimeout, CancellationToken cancellationToken)
 				if (cancellationToken.CanBeCanceled) {
 					var result = WaitHandle.WaitAny (new[] { handle, cancellationToken.WaitHandle }, millisecondsTimeout, false);
 					if (result == 1)
-						throw new OperationCanceledException_ (cancellationToken);
+                        throw new System.Couchbase.OperationCanceledException (cancellationToken);
 					if (result == WaitHandle.WaitTimeout)
 						return false;
 				} else {

System/OperationCanceledException.cs

@@ -31,50 +31,50 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-namespace System
+namespace System.Couchbase
 {
 	[Serializable]
 	[ComVisible (true)]
-    public class OperationCanceledException_ : OperationCanceledException
+    public class OperationCanceledException : System.OperationCanceledException
 	{
 
 		const int Result = unchecked ((int)0x8013153b);
 		readonly CancellationToken? token;
 
 		// Constructors
-		public OperationCanceledException_ ()
+        public OperationCanceledException ()
 			: base ("The operation was canceled.")
 		{
 		}
 
-		public OperationCanceledException_ (string message)
+        public OperationCanceledException (string message)
 			: base (message)
 		{
 		}
 
-		public OperationCanceledException_ (string message, Exception innerException)
+        public OperationCanceledException (string message, Exception innerException)
 			: base (message, innerException)
 		{
 		}
 
-		protected OperationCanceledException_ (SerializationInfo info, StreamingContext context)
+        protected OperationCanceledException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 		}
 
-		public OperationCanceledException_ (CancellationToken token)
+        public OperationCanceledException (CancellationToken token)
 			: this ()
 		{
 			this.token = token;
 		}
 
-		public OperationCanceledException_ (string message, CancellationToken token)
+        public OperationCanceledException (string message, CancellationToken token)
 			: this (message)
 		{
 			this.token = token;
 		}
 
-		public OperationCanceledException_ (string message, Exception innerException, CancellationToken token)
+        public OperationCanceledException (string message, Exception innerException, CancellationToken token)
 			: base (message, innerException)
 		{
 			this.token = token;