2004-12-17 Joe Shaw <joeshaw@novell.com>

	* mono/DBusType/Byte.cs, mono/DBusType/Int32.cs,
	mono/DBusType/Int64.cs, mono/DBusType/UInt32.cs,
	mono/DBusType/UInt64.cs: Use Enum.GetUnderlyingType() instead of
	Type.UnderlyingSystemType to get the actual system type
	underneath.  This code previously depended on the broken Mono
	behavior, which was fixed in 1.1.3.

diff --git a/ChangeLog b/ChangeLog
index 621b3bfd3cb645b4fb216c3d170f376a5959e946..4783db899e56389dec94f8c761f978d79602fac6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-17  Joe Shaw  <joeshaw@novell.com>
+
+       * mono/DBusType/Byte.cs, mono/DBusType/Int32.cs,
+       mono/DBusType/Int64.cs, mono/DBusType/UInt32.cs,
+       mono/DBusType/UInt64.cs: Use Enum.GetUnderlyingType() instead of
+       Type.UnderlyingSystemType to get the actual system type
+       underneath.  This code previously depended on the broken Mono
+       behavior, which was fixed in 1.1.3.
+
 2004-11-27  Havoc Pennington  <hp@redhat.com>
 
        * dbus/dbus-string.h (_dbus_string_get_byte): inline when asserts

diff --git a/mono/DBusType/Byte.cs b/mono/DBusType/Byte.cs
index a3d0ac9c64eaad7ed02bb4644e49e65f1eb7450e..2fb19aeb62dbf99e1ead310930a6709cd500c482 100644 (file)
--- a/mono/DBusType/Byte.cs
+++ b/mono/DBusType/Byte.cs
@@ -41,7 +41,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.Byte)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.Byte)) {
        return true;
       }
 

diff --git a/mono/DBusType/Int32.cs b/mono/DBusType/Int32.cs
index 681a55f39f72129972561253083fbf41695f883d..a759b79419ebfde0a0b2006e6317e6f00aef4e59 100644 (file)
--- a/mono/DBusType/Int32.cs
+++ b/mono/DBusType/Int32.cs
@@ -36,7 +36,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.Int32)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.Int32)) {
        return true;
       }
       

diff --git a/mono/DBusType/Int64.cs b/mono/DBusType/Int64.cs
index 741d272af8d4ff57441b7059803e1371878c9e92..6aea7ee8d92a8ed1ecbabbde27739014ae126f05 100644 (file)
--- a/mono/DBusType/Int64.cs
+++ b/mono/DBusType/Int64.cs
@@ -36,7 +36,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.Int64)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.Int64)) {
        return true;
       }
 

diff --git a/mono/DBusType/UInt32.cs b/mono/DBusType/UInt32.cs
index e97aa37d277f1c54766632bb057a945bf1a275b9..b55893d36c0815c5d271635254a1cbefc9f26cf5 100644 (file)
--- a/mono/DBusType/UInt32.cs
+++ b/mono/DBusType/UInt32.cs
@@ -36,7 +36,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.UInt32)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.UInt32)) {
        return true;
       }
 

diff --git a/mono/DBusType/UInt64.cs b/mono/DBusType/UInt64.cs
index 84fef06b04981062fbe99e0ee664971031192e69..c987a918b25882fabf499770a218eed2bdd499b5 100644 (file)
--- a/mono/DBusType/UInt64.cs
+++ b/mono/DBusType/UInt64.cs
@@ -36,7 +36,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.UInt64)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.UInt64)) {
        return true;
       }