[Pkg-cli-apps-commits] [fsharp] 03/71: Minor textual changes to align fsharp/fsharp with fsharppowerpack.codeplex.com

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to tag 3.1.0
in repository fsharp.

commit a66d529b822249d67e1392881b5e43284d4b285e
Author: Don Syme <donsyme at fastmail.fm>
Date:   Fri May 3 16:41:06 2013 +0200

    Minor textual changes to align fsharp/fsharp with fsharppowerpack.codeplex.com
---
 src/fsharp/FSharp.Core/Linq.fs  | 2 +-
 src/fsharp/FSharp.Core/local.fs | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/fsharp/FSharp.Core/Linq.fs b/src/fsharp/FSharp.Core/Linq.fs
index 7fbaa71..ebc84fc 100755
--- a/src/fsharp/FSharp.Core/Linq.fs
+++ b/src/fsharp/FSharp.Core/Linq.fs
@@ -212,7 +212,7 @@ module LeafExpressionConverter =
 #if FX_NO_REFLECTION_METADATA_TOKENS
 #else
                         minfo.MetadataToken = minfo2.MetadataToken &&
-#endif
+#endif                                          
                         if isg1 then minfo2.IsGenericMethod && gmd = minfo2.GetGenericMethodDefinition()
                         else minfo = minfo2
                      ) -> 
diff --git a/src/fsharp/FSharp.Core/local.fs b/src/fsharp/FSharp.Core/local.fs
index 10ec230..5a208e0 100755
--- a/src/fsharp/FSharp.Core/local.fs
+++ b/src/fsharp/FSharp.Core/local.fs
@@ -541,17 +541,19 @@ module internal Array =
             | _,_ when valuesExist && (keys.Length <> values.Length) -> raise (ArgumentException())
             | _,_ ->   
             qsort(keys,values,0,keys.Length-1,LanguagePrimitives.FastGenericComparer<'Key>)
+(*
         static member Sort<'Key,'Value when 'Key : comparison>(keys : 'Key[], values : 'Value[], start : int, last : int) =
             match keys with
             | null -> raise (ArgumentNullException())
             | _ ->        
             qsort(keys,values,start,last,LanguagePrimitives.FastGenericComparer<'Key>)
-        static member Sort<'Key,'Value when 'Key : comparison>(keys : 'Key[], values : 'Value[], start : int, last : int, comparer : IComparer<'Key>) =
+*)
+        static member Sort<'Key,'Value when 'Key : comparison>(keys : 'Key[], values : 'Value[], start : int, length : int, comparer : IComparer<'Key>) =
             match keys with
             | null -> raise (ArgumentNullException())
             | _ ->        
             let comparer = match comparer with null -> LanguagePrimitives.FastGenericComparer<'Key> | _ -> comparer
-            qsort(keys,values,start,last,comparer)
+            qsort(keys,values,start,start+length-1,comparer)
 #else
 #endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git