[Pkg-cli-apps-commits] [fsharp] 04/71: Integrate updates from Visual F# team for Visual Studio 2012 Update 2

[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 c293c6b834cc3f3f53b6e5ea574f4c464bba40b9
Author: Don Syme <donsyme at fastmail.fm>
Date:   Thu May 2 14:05:21 2013 +0200

    Integrate updates from Visual F# team for Visual Studio 2012 Update 2
---
 src/fsharp/ilxgen.fs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fsharp/ilxgen.fs b/src/fsharp/ilxgen.fs
index f19ac35..14123f6 100755
--- a/src/fsharp/ilxgen.fs
+++ b/src/fsharp/ilxgen.fs
@@ -3612,17 +3612,17 @@ and GenObjectExpr cenv cgbuf eenvouter expr (baseType,baseValOpt,basecall,overri
     let ilCtorBody = CodeGenMethodForExpr cenv cgbuf.mgbuf (SPAlways,[],cloName,eenvinner,1,0,basecall,discardAndReturnVoid)
 
 
-    let genMethodAndOptionalMethodImpl tmethod = 
-        [ for ((useMethodImpl,methodImplGeneratorFunction,methTyparsOfOverridingMethod),mdef) in GenObjectMethod cenv eenvinner cgbuf (isInterfaceTy cenv.g baseType) tmethod do
+    let genMethodAndOptionalMethodImpl tmethod useMethodImpl = 
+        [ for ((useMethodImpl,methodImplGeneratorFunction,methTyparsOfOverridingMethod),mdef) in GenObjectMethod cenv eenvinner cgbuf useMethodImpl tmethod do
               let mimpl = (if useMethodImpl then Some(methodImplGeneratorFunction (ilTyForOverriding,methTyparsOfOverridingMethod)) else None)
               yield (mimpl,mdef) ]  
 
     let mimpls,mdefs = 
         [ for ov in overrides do 
-              yield! genMethodAndOptionalMethodImpl ov 
+              yield! genMethodAndOptionalMethodImpl ov (isInterfaceTy cenv.g baseType)
           for (_,tmethods) in interfaceImpls do 
              for tmethod in tmethods do 
-                 yield! genMethodAndOptionalMethodImpl tmethod ]
+                 yield! genMethodAndOptionalMethodImpl tmethod true ]
         |> List.unzip 
 
     let mimpls = mimpls |> List.choose id // choose the ones that actually have method impls

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