Changeset 15018 for branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable

Timestamp:

06/01/17 11:29:49 (8 years ago)

Author:

gkronber

Message:

#2520 introduced StorableConstructorFlag type for StorableConstructors

File:

• branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (2 diffs)

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -50 +50 @@
 
     [StorableConstructor]
-    private StorableSerializer(bool deserializing) : this() { }
+    private StorableSerializer(StorableConstructorFlag deserializing) : this() { }
 
     #region ICompositeSerializer implementation
@@ -241 +241 @@
         .Where(ci => ci.GetCustomAttributes(typeof(StorableConstructorAttribute), false).Length > 0)) {
         if (ci.GetParameters().Length != 1 ||
-            ci.GetParameters()[0].ParameterType != typeof(bool))
-          throw new PersistenceException("StorableConstructor must have exactly one argument of type bool");
+            ci.GetParameters()[0].ParameterType != typeof(StorableConstructorFlag))
+          throw new PersistenceException("StorableConstructor must have exactly one argument of type StorableConstructorFlag");
         var dm = new DynamicMethod("", typeof(object), null, type, true);
         var ilgen = dm.GetILGenerator();
-        ilgen.Emit(OpCodes.Ldc_I4_1); // load true
+        var local = ilgen.DeclareLocal(typeof(StorableConstructorFlag));
+        ilgen.Emit(OpCodes.Ldloca_S, local);
+        ilgen.Emit(OpCodes.Initobj,typeof(StorableConstructorFlag)); // load default value for StorableConstructorFlag
+        ilgen.Emit(OpCodes.Ldloc_0);
         ilgen.Emit(OpCodes.Newobj, ci);
         ilgen.Emit(OpCodes.Ret);