Improved enum support.

SvenGroot · Oct 26, 2023 · 02a64ef · 02a64ef
1 parent 8c21109
commit 02a64ef
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/Ookii.Jumbo/IO/DefaultValueWriter.cs b/src/Ookii.Jumbo/IO/DefaultValueWriter.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Sven Groot (Ookii.org)
 using System;
+using System.Collections.Generic;
 using System.IO;
 
 namespace Ookii.Jumbo.IO
@@ -577,16 +578,13 @@ private class EnumWriter<T, TUnderlying> : IValueWriter<T>
             where T : Enum
             where TUnderlying : notnull
         {
-            private readonly IValueWriter<TUnderlying>  _underlyingWriter = ValueWriter<TUnderlying>.Writer!;
-
             public T Read(BinaryReader reader)
-                => (T)Enum.ToObject(typeof(T), _underlyingWriter.Read(reader));
+                => (T)Enum.ToObject(typeof(T), ValueWriter<TUnderlying>.ReadValue(reader));
 
             public void Write(T value, BinaryWriter writer)
-                => _underlyingWriter.Write((TUnderlying)Convert.ChangeType(value, typeof(TUnderlying)), writer);
+                => ValueWriter<TUnderlying>.WriteValue((TUnderlying)Convert.ChangeType(value, typeof(TUnderlying)), writer);
         }
 
-
         #endregion
 
         public static object GetWriter(Type type)