Merge pull request #139 from humhei/dynamic

Remove dynamic keyword
akkadotnet · Jul 8, 2021 · f652d7c · f652d7c
2 parents 77770e4 + e46f7f6
commit f652d7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
-
+.ionide/**
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 

diff --git a/src/Hyperion/SerializerFactories/ArraySerializerFactory.cs b/src/Hyperion/SerializerFactories/ArraySerializerFactory.cs
@@ -71,8 +71,7 @@ public override ValueSerializer BuildSerializer(Serializer serializer, Type type
                     session.TrackSerializedObject(arr);
                 }
 
-                // This janky way of converting array to Array is done to get around the problem of ValueType arrays
-                WriteValues(((IEnumerable)arr).Cast<object>().ToArray(), stream, elementType, elementSerializer, session);
+                WriteValues((Array)arr, stream, elementType, elementSerializer, session);
             };
             arraySerializer.Initialize(reader, writer);
 

diff --git a/src/Hyperion/ValueSerializers/ConsistentArraySerializer.cs b/src/Hyperion/ValueSerializers/ConsistentArraySerializer.cs
@@ -71,15 +71,16 @@ public override void WriteValue(Stream stream, object value, SerializerSession s
             var elementSerializer = session.Serializer.GetSerializerByType(elementType);
             elementSerializer.WriteManifest(stream, session); //write array element type
             // ReSharper disable once PossibleNullReferenceException
-            WriteValues((dynamic)value, stream,elementSerializer,session);
+            WriteValues((Array)value, stream,elementSerializer,session);
         }
 
-        private static void WriteValues<T>(T[] array, Stream stream, ValueSerializer elementSerializer, SerializerSession session)
+        private static void WriteValues(Array array, Stream stream, ValueSerializer elementSerializer, SerializerSession session)
         {
+            var tp = array.GetType();
             Int32Serializer.WriteValueImpl(stream,array.Length,session);
-            if (typeof(T).IsFixedSizeType())
+            if (tp.IsFixedSizeType())
             {
-                var size = typeof(T).GetTypeSize();
+                var size = tp.GetTypeSize();
                 var result = new byte[array.Length * size];
                 Buffer.BlockCopy(array, 0, result, 0, result.Length);
                 stream.Write(result);