diff options
| author | Geoff Norton <grompf@sublimeintervention.com> | 2010-02-11 06:45:57 +0300 |
|---|---|---|
| committer | Geoff Norton <grompf@sublimeintervention.com> | 2010-02-11 06:45:57 +0300 |
| commit | 91b722f1d4b469c10c46fad3396a876c4414c87b (patch) | |
| tree | b15fdb5b63c3d5e93e67f88dc4d073754fb4d145 | |
| parent | f399ffb981bfd4b2ef85e519e032f2d51d4ecaf0 (diff) | |
2010-02-10 Geoff Norton <gnorton@novell.com>moon/2.99.0.2
* reflection.c: Support building with DISABLE_REFLECTION
svn path=/branches/mono-2-6/mono/; revision=151288
| -rw-r--r-- | mono/metadata/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/metadata/reflection.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index cd122a7f2a9..cdddb9ea8b3 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,7 @@ +2010-02-10 Geoff Norton <gnorton@novell.com> + + * reflection.c: Support building with DISABLE_REFLECTION + 2010-02-09 Gonzalo Paniagua Javier <gonzalo@novell.com> * threadpool.c: Fixes for SetMinThreads and SetMaxThreads. diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c index ddf2dc84476..61bdc2d160d 100644 --- a/mono/metadata/reflection.c +++ b/mono/metadata/reflection.c @@ -162,10 +162,10 @@ static gpointer resolve_object (MonoImage *image, MonoObject *obj, MonoClass **h static guint32 mono_image_get_methodref_token_for_methodbuilder (MonoDynamicImage *assembly, MonoReflectionMethodBuilder *method); static guint32 encode_generic_method_sig (MonoDynamicImage *assembly, MonoGenericContext *context); static gpointer register_assembly (MonoDomain *domain, MonoReflectionAssembly *res, MonoAssembly *assembly); -#endif - static void reflection_methodbuilder_from_method_builder (ReflectionMethodBuilder *rmb, MonoReflectionMethodBuilder *mb); static void reflection_methodbuilder_from_ctor_builder (ReflectionMethodBuilder *rmb, MonoReflectionCtorBuilder *mb); +#endif + static guint32 mono_image_typedef_or_ref (MonoDynamicImage *assembly, MonoType *type); static guint32 mono_image_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType *type, gboolean try_typespec); static void mono_image_get_generic_param_info (MonoReflectionGenericParam *gparam, guint32 owner, MonoDynamicImage *assembly); @@ -1398,6 +1398,7 @@ mono_image_basic_method (ReflectionMethodBuilder *mb, MonoDynamicImage *assembly } } +#ifndef DISABLE_REFLECTION_EMIT static void reflection_methodbuilder_from_method_builder (ReflectionMethodBuilder *rmb, MonoReflectionMethodBuilder *mb) { @@ -1470,7 +1471,6 @@ reflection_methodbuilder_from_ctor_builder (ReflectionMethodBuilder *rmb, MonoRe rmb->refs = NULL; } -#ifndef DISABLE_REFLECTION_EMIT static void reflection_methodbuilder_from_dynamic_method (ReflectionMethodBuilder *rmb, MonoReflectionDynamicMethod *mb) { @@ -1535,6 +1535,7 @@ mono_image_add_methodimpl (MonoDynamicImage *assembly, MonoReflectionMethodBuild values [MONO_METHODIMPL_DECLARATION] = tok; } +#ifndef DISABLE_REFLECTION_EMIT static void mono_image_get_method_info (MonoReflectionMethodBuilder *mb, MonoDynamicImage *assembly) { @@ -1598,6 +1599,7 @@ mono_image_get_ctor_info (MonoDomain *domain, MonoReflectionCtorBuilder *mb, Mon mono_image_basic_method (&rmb, assembly); mb->table_idx = *rmb.table_idx; } +#endif static char* type_get_fully_qualified_name (MonoType *type) @@ -3200,7 +3202,6 @@ mono_image_get_array_token (MonoDynamicImage *assembly, MonoReflectionArrayMetho m->table_idx = am->token & 0xffffff; return am->token; } -#endif /* * Insert into the metadata tables all the info about the TypeBuilder tb. @@ -3364,6 +3365,7 @@ mono_image_get_type_info (MonoDomain *domain, MonoReflectionTypeBuilder *tb, Mon } } } +#endif static void collect_types (GPtrArray *types, MonoReflectionTypeBuilder *type) |