Support older compilers

and fix linebreaks and line endings

Author: Emile Joubert

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -333,13 +333,13 @@ uint QueueDelete(string queue,
         bool WaitForConfirms();
 
         ///<summary>Wait until all published messages have been confirmed.
-        ///</summary>
-        ///<returns>true if no nacks were received within the timeout, 
-        ///otherwise false</returns>
-        ///<param name="timeout">How long to wait (at most) before returning 
-        ///whether or not any nacks were returned</param>
-        ///<param name="timedOut">True if the method returned because
-        ///the timeout elapsed, not because all messages were ack'd
+        ///</summary>
+        ///<returns>true if no nacks were received within the timeout,
+        ///otherwise false</returns>
+        ///<param name="timeout">How long to wait (at most) before returning
+        ///whether or not any nacks were returned</param>
+        ///<param name="timedOut">True if the method returned because
+        ///the timeout elapsed, not because all messages were ack'd
         ///or at least one nack'd.</param>
         ///<remarks>
         ///Waits until all messages published since the last call have
@@ -371,8 +371,8 @@ uint QueueDelete(string queue,
         ///</summary>
         ///<remarks>
         ///Waits until all messages published since the last call have
-        ///been ack'd by the broker.  If a nack is received or the timeout 
-        ///elapses, throws an OperationInterrupedException exception 
+        ///been ack'd by the broker.  If a nack is received or the timeout
+        ///elapses, throws an OperationInterrupedException exception
         ///immediately.
         ///</remarks>
         [AmqpMethodDoNotImplement(null)]

projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

@@ -958,54 +958,54 @@ public void ConfirmSelect()
             _Private_ConfirmSelect(false);
         }
 
-        public bool WaitForConfirms(TimeSpan timeout, out bool timedOut)
-        {
-            var isWaitInfinite = (timeout.TotalMilliseconds == Timeout.Infinite);
-            var stopwatch = Stopwatch.StartNew();
-            lock (m_unconfirmedSet.SyncRoot)
-            {
-                while (true)
-                {
-                    if (CloseReason != null)
-                        throw new AlreadyClosedException(CloseReason);
-
-                    if (m_unconfirmedSet.Count == 0)
-                    {
-                        bool aux = m_onlyAcksReceived;
-                        m_onlyAcksReceived = true;
-                        timedOut = false;
-                        return aux;
-                    }
-                    if (isWaitInfinite)
-                        Monitor.Wait(m_unconfirmedSet.SyncRoot);
-                    else
-                    {
-                        var elapsed = stopwatch.Elapsed;
-                        if(elapsed > timeout || !Monitor.Wait(
-                            m_unconfirmedSet.SyncRoot, timeout - elapsed))
-                        {
-                            timedOut = true;
-                            return true;
-                        }
-                    }
-                }
-            }
+        public bool WaitForConfirms(TimeSpan timeout, out bool timedOut)
+        {
+            bool isWaitInfinite = (timeout.TotalMilliseconds == Timeout.Infinite);
+            Stopwatch stopwatch = Stopwatch.StartNew();
+            lock (m_unconfirmedSet.SyncRoot)
+            {
+                while (true)
+                {
+                    if (CloseReason != null)
+                        throw new AlreadyClosedException(CloseReason);
+
+                    if (m_unconfirmedSet.Count == 0)
+                    {
+                        bool aux = m_onlyAcksReceived;
+                        m_onlyAcksReceived = true;
+                        timedOut = false;
+                        return aux;
+                    }
+                    if (isWaitInfinite)
+                        Monitor.Wait(m_unconfirmedSet.SyncRoot);
+                    else
+                    {
+                        TimeSpan elapsed = stopwatch.Elapsed;
+                        if(elapsed > timeout || !Monitor.Wait(
+                            m_unconfirmedSet.SyncRoot, timeout - elapsed))
+                        {
+                            timedOut = true;
+                            return true;
+                        }
+                    }
+                }
+            }
         }
 
         public bool WaitForConfirms()
-        {
-            bool timedOut;
+        {
+            bool timedOut;
             return WaitForConfirms(TimeSpan.FromMilliseconds(Timeout.Infinite), out timedOut);
         }
 
-        public void WaitForConfirmsOrDie()
-        {
-            WaitForConfirmsOrDie(TimeSpan.FromMilliseconds(Timeout.Infinite));
-        }
-
+        public void WaitForConfirmsOrDie()
+        {
+            WaitForConfirmsOrDie(TimeSpan.FromMilliseconds(Timeout.Infinite));
+        }
+
         public void WaitForConfirmsOrDie(TimeSpan timeout)
-        {
-            bool timedOut;
+        {
+            bool timedOut;
             bool onlyAcksReceived = WaitForConfirms(timeout, out timedOut);
             if (!onlyAcksReceived) {
                 Close(new ShutdownEventArgs(ShutdownInitiator.Application,
@@ -1017,7 +1017,7 @@ public void WaitForConfirmsOrDie(TimeSpan timeout)
             if (timedOut) {
                 Close(new ShutdownEventArgs(ShutdownInitiator.Application,
                                             CommonFraming.Constants.ReplySuccess,
-                                            "Timed out waiting for acks", 
+                                            "Timed out waiting for acks",
                                             new IOException("timed out waiting for acks")),
                       false);
                 throw new IOException("Timed out waiting for acks");