[Pkg-cli-apps-commits] [fsharp] 05/71: change to align 3.1 base with base for 3.0 code drop

[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 48c59043644d4fd4675ff8d1fe89d4185950a83d
Author: Don Syme <donsyme at fastmail.fm>
Date:   Thu Oct 3 09:55:31 2013 +0100

    change to align 3.1 base with base for 3.0 code drop
---
 src/fsharp/ilxgen.fs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/fsharp/ilxgen.fs b/src/fsharp/ilxgen.fs
index 14123f6..ce6463b 100755
--- a/src/fsharp/ilxgen.fs
+++ b/src/fsharp/ilxgen.fs
@@ -6791,15 +6791,20 @@ and GenExnDef cenv mgbuf eenv m (exnc:Tycon) =
         
         let interfaces =  exnc.ImmediateInterfaceTypesOfFSharpTycon |> List.map (GenType cenv.amap m cenv.g eenv.tyenv) 
         let tdef = 
-          mkILGenericClass
-            (ilTypeName,access,[],cenv.g.ilg.typ_Exception, 
-             interfaces,  
+          let serCtors = 
+            if cenv.opts.netFxHasSerializableAttribute then
 #if BE_SECURITY_TRANSPARENT
-             (ignore(getObjectDataMethodForSerialization);
-              mkILMethods ([ilCtorDef] @ ilMethodDefsForComparison @ ilCtorDefNoArgs @ [ ilCtorDefForSerialziation ] @ ilMethodDefsForProperties)),
+              ignore(getObjectDataMethodForSerialization)
+              [ ilCtorDefForSerialziation ]
 #else
-             mkILMethods ([ilCtorDef] @ ilMethodDefsForComparison @ ilCtorDefNoArgs @ [ getObjectDataMethodForSerialization; ilCtorDefForSerialziation ] @ ilMethodDefsForProperties),
+              [ getObjectDataMethodForSerialization; ilCtorDefForSerialziation ]
 #endif
+            else
+              []
+          mkILGenericClass
+            (ilTypeName,access,[],cenv.g.ilg.typ_Exception, 
+             interfaces,  
+             mkILMethods ([ilCtorDef] @ ilMethodDefsForComparison @ ilCtorDefNoArgs @ serCtors @ ilMethodDefsForProperties),
              mkILFields ilFieldDefs,
              emptyILTypeDefs, 
              mkILProperties ilPropertyDefs,

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