Merge pull request connamara#364 from gbirchmeier/nodefaultparam

remove .NET 4.0 features (default params, named params)
james-713 · Feb 1, 2016 · 25c5962 · 25c5962
2 parents 7719497 + b6e2293
commit 25c5962
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 17 deletions.
diff --git a/QuickFIXn/Message/Message.cs b/QuickFIXn/Message/Message.cs
@@ -358,7 +358,20 @@ public void FromString(string msgstr, bool validate, DataDictionary.DataDictiona
         {
             FromString(msgstr, validate, sessionDD, appDD, null);
         }
-
+
+        /// <summary>
+        /// Create a Message from a FIX string
+        /// </summary>
+        /// <param name="msgstr"></param>
+        /// <param name="validate"></param>
+        /// <param name="sessionDD"></param>
+        /// <param name="appDD"></param>
+        /// <param name="msgFactory">If null, any groups will be constructed as generic Group objects</param>
+        public void FromString(string msgstr, bool validate,
+            DataDictionary.DataDictionary sessionDD, DataDictionary.DataDictionary appDD, IMessageFactory msgFactory)
+        {
+            FromString(msgstr, validate, sessionDD, appDD, msgFactory, false);
+        }
 
         /// <summary>
         /// Creates a Message from a FIX string
@@ -373,7 +386,7 @@ public void FromString(string msgstr, bool validate, DataDictionary.DataDictiona
         ///   </param>
         public void FromString(string msgstr, bool validate,
             DataDictionary.DataDictionary sessionDD, DataDictionary.DataDictionary appDD, IMessageFactory msgFactory,
-            bool ignoreBody=false)
+            bool ignoreBody)
         {
             Clear();
 

diff --git a/QuickFIXn/Session.cs b/QuickFIXn/Session.cs
@@ -1349,7 +1349,13 @@ public bool GenerateHeartbeat(Message testRequest)
             return SendRaw(heartbeat, 0);
         }
 
-        internal bool GenerateReject(MessageBuilder msgBuilder, FixValues.SessionRejectReason reason, int field=0)
+
+        internal bool GenerateReject(MessageBuilder msgBuilder, FixValues.SessionRejectReason reason)
+        {
+            return GenerateReject(msgBuilder.RejectableMessage(), reason, 0);
+        }
+
+        internal bool GenerateReject(MessageBuilder msgBuilder, FixValues.SessionRejectReason reason, int field)
         {
             return GenerateReject(msgBuilder.RejectableMessage(), reason, field);
         }

diff --git a/QuickFIXn/SessionState.cs b/QuickFIXn/SessionState.cs
@@ -281,7 +281,12 @@ public void Get(int begSeqNo, int endSeqNo, List<string> messages)
             }
         }
 
-        public void SetResendRange(int begin, int end, int chunkEnd=-1)
+        public void SetResendRange(int begin, int end)
+        {
+            SetResendRange(begin, end, -1);
+        }
+
+        public void SetResendRange(int begin, int end, int chunkEnd)
         {
             resendRange_.BeginSeqNo = begin;
             resendRange_.EndSeqNo = end;

diff --git a/QuickFIXn/SocketInitiatorThread.cs b/QuickFIXn/SocketInitiatorThread.cs
@@ -136,7 +136,7 @@ protected int ReadSome(byte[] buffer, int timeoutMilliseconds)
             {
                 // Begin read if it is not already started
                 if (currentReadRequest_ == null)
-                    currentReadRequest_ = stream_.BeginRead(buffer, 0, buffer.Length, callback: null, state: null);
+                    currentReadRequest_ = stream_.BeginRead(buffer, 0, buffer.Length, null, null);
 
                 // Wait for it to complete (given timeout)
                 currentReadRequest_.AsyncWaitHandle.WaitOne(timeoutMilliseconds);

diff --git a/QuickFIXn/SocketReader.cs b/QuickFIXn/SocketReader.cs
@@ -41,7 +41,7 @@ public void Read()
         {
             try
             {
-                int bytesRead = ReadSome(readBuffer_, timeoutMilliseconds: 1000);
+                int bytesRead = ReadSome(readBuffer_, 1000);
                 if (bytesRead > 0)
                     parser_.AddToStream(System.Text.Encoding.UTF8.GetString(readBuffer_, 0, bytesRead));
                 else if (null != qfSession_)
@@ -79,7 +79,7 @@ protected virtual int ReadSome(byte[] buffer, int timeoutMilliseconds)
             {
                 // Begin read if it is not already started
                 if (currentReadRequest_ == null)
-                    currentReadRequest_ = stream_.BeginRead(buffer, 0, buffer.Length, callback: null, state: null);
+                    currentReadRequest_ = stream_.BeginRead(buffer, 0, buffer.Length, null, null);
 
                 // Wait for it to complete (given timeout)
                 currentReadRequest_.AsyncWaitHandle.WaitOne(timeoutMilliseconds);

diff --git a/QuickFIXn/SocketSettings.cs b/QuickFIXn/SocketSettings.cs
@@ -156,7 +156,7 @@ public void Configure(QuickFix.Dictionary dictionary)
                 try
                 {
                     SslProtocol = (System.Security.Authentication.SslProtocols)
-                        Enum.Parse(typeof(System.Security.Authentication.SslProtocols), protocolString, ignoreCase: true);
+                        Enum.Parse(typeof(System.Security.Authentication.SslProtocols), protocolString, true);
                 }
                 catch (Exception)
                 {

diff --git a/QuickFIXn/Transport/StreamFactory.cs b/QuickFIXn/Transport/StreamFactory.cs
@@ -29,7 +29,7 @@ public static Stream CreateClientStream(IPEndPoint endpoint, SocketSettings sett
             var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
             socket.NoDelay = settings.SocketNodelay;
             socket.Connect(endpoint);
-            Stream stream = new NetworkStream(socket, ownsSocket: true);
+            Stream stream = new NetworkStream(socket, true);
 
             if (settings.UseSSL)
             {
@@ -183,10 +183,7 @@ public SSLStreamFactory(ILog log, SocketSettings settings)
             /// <returns>a ssl enabled stream</returns>
             public Stream CreateClientStreamAndAuthenticate(Stream innerStream)
             {
-                var sslStream = new SslStream(innerStream,
-                                                leaveInnerStreamOpen: false,
-                                                userCertificateValidationCallback: ValidateServerCertificate,
-                                                userCertificateSelectionCallback: SelectLocalCertificate);
+                var sslStream = new SslStream(innerStream, false, ValidateServerCertificate, SelectLocalCertificate);
 
                 try
                 {
@@ -213,10 +210,7 @@ public Stream CreateClientStreamAndAuthenticate(Stream innerStream)
             /// <returns>a ssl enabled stream</returns>
             public Stream CreateServerStreamAndAuthenticate(Stream innerStream)
             {
-                var sslStream = new SslStream(innerStream,
-                                                leaveInnerStreamOpen: false,
-                                                userCertificateValidationCallback: ValidateClientCertificate,
-                                                userCertificateSelectionCallback: SelectLocalCertificate);
+                var sslStream = new SslStream(innerStream, false, ValidateClientCertificate, SelectLocalCertificate);
 
                 try
                 {