2004-07-21 Bernie Solomon <bernard@ugsolutions.com>

	* reflection.c (type_get_fully_qualified_name):
	insert cast to get type checking of ?: with non-gcc compilers

svn path=/trunk/mono/; revision=31341

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index a932652a8aca87d5d5196d7140213d307993e012..b11ad4dfeb19991178a6e0b7f29d2591f53f6426 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-21  Bernie Solomon  <bernard@ugsolutions.com>
+
+       * reflection.c (type_get_fully_qualified_name): 
+       insert cast to get type checking of ?: with non-gcc compilers
+
 2004-07-21  Bernie Solomon  <bernard@ugsolutions.com>
 
        * rand.c: use g_getenv for both lookups of

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 1e2f09a880b05a423c2bac2424847bb905d562f0..2b3571cbfb0a1369d5f0b63e602b0bee069bb0e1 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -1421,7 +1421,7 @@ type_get_fully_qualified_name (MonoType *type) {
                name, ta->aname.name,
                ta->aname.major, ta->aname.minor, ta->aname.build, ta->aname.revision,
                ta->aname.culture && *ta->aname.culture? ta->aname.culture: "neutral",
-               ta->aname.public_key_token [0] ? ta->aname.public_key_token : "null");
+               ta->aname.public_key_token [0] ? (char *)ta->aname.public_key_token : "null");
        g_free (name);
        return result;
 }