Wed Feb 24 17:45:27 CET 2010 Paolo Molaro <lupus@ximian.com>

[mono.git] / mono / metadata / class.h

diff --git a/mono/metadata/class.h b/mono/metadata/class.h
index 8a0b922cb4808a52735c56f86d15acb84dd6cb24..1142dca5bdf308c2c70d46f0632167d8fb429a67 100644 (file)
--- a/mono/metadata/class.h
+++ b/mono/metadata/class.h
@@ -5,7 +5,7 @@
 #include <mono/metadata/image.h>
 #include <mono/metadata/loader.h>
 
-G_BEGIN_DECLS
+MONO_BEGIN_DECLS
 
 typedef struct MonoVTable MonoVTable;
 
@@ -13,22 +13,13 @@ typedef struct _MonoClassField MonoClassField;
 typedef struct _MonoProperty MonoProperty;
 typedef struct _MonoEvent MonoEvent;
 
-typedef struct {
-       MonoVTable *default_vtable;
-       MonoVTable *xdomain_vtable;
-       MonoClass *proxy_class;
-       char* proxy_class_name;
-       guint interface_count;
-       MonoClass *interfaces [MONO_ZERO_LEN_ARRAY];
-} MonoRemoteClass;
-
 MonoClass *
-mono_class_get             (MonoImage *image, guint32 type_token);
+mono_class_get             (MonoImage *image, uint32_t type_token);
 
 MonoClass *
-mono_class_get_full        (MonoImage *image, guint32 type_token, MonoGenericContext *context);
+mono_class_get_full        (MonoImage *image, uint32_t type_token, MonoGenericContext *context);
 
-gboolean
+mono_bool
 mono_class_init            (MonoClass *klass);
 
 MonoVTable *
@@ -44,13 +35,13 @@ MonoMethod *
 mono_class_get_method_from_name_flags (MonoClass *klass, const char *name, int param_count, int flags);
 
 MonoClass * 
-mono_class_from_typeref    (MonoImage *image, guint32 type_token);
+mono_class_from_typeref    (MonoImage *image, uint32_t type_token);
 
 MonoClass *
-mono_class_from_generic_parameter (MonoGenericParam *param, MonoImage *image, gboolean is_mvar);
+mono_class_from_generic_parameter (MonoGenericParam *param, MonoImage *image, mono_bool is_mvar);
 
 MonoType*
-mono_class_inflate_generic_type (MonoType *type, MonoGenericContext *context);
+mono_class_inflate_generic_type (MonoType *type, MonoGenericContext *context) /* MONO_DEPRECATED */;
 
 MonoMethod*
 mono_class_inflate_generic_method (MonoMethod *method, MonoGenericContext *context);
@@ -59,65 +50,65 @@ MonoMethod *
 mono_get_inflated_method (MonoMethod *method);
 
 MonoClassField*
-mono_field_from_token      (MonoImage *image, guint32 token, MonoClass **retklass, MonoGenericContext *context);
+mono_field_from_token      (MonoImage *image, uint32_t token, MonoClass **retklass, MonoGenericContext *context);
 
 MonoClass *
-mono_bounded_array_class_get (MonoClass *element_class, guint32 rank, gboolean bounded);
+mono_bounded_array_class_get (MonoClass *element_class, uint32_t rank, mono_bool bounded);
 
 MonoClass *
-mono_array_class_get       (MonoClass *element_class, guint32 rank);
+mono_array_class_get       (MonoClass *element_class, uint32_t rank);
 
 MonoClass *
 mono_ptr_class_get         (MonoType *type);
 
 MonoClassField *
-mono_class_get_field       (MonoClass *klass, guint32 field_token);
+mono_class_get_field       (MonoClass *klass, uint32_t field_token);
 
 MonoClassField *
 mono_class_get_field_from_name (MonoClass *klass, const char *name);
 
-guint32
+uint32_t
 mono_class_get_field_token (MonoClassField *field);
 
-guint32
+uint32_t
 mono_class_get_event_token (MonoEvent *event);
 
 MonoProperty*
 mono_class_get_property_from_name (MonoClass *klass, const char *name);
 
-guint32
+uint32_t
 mono_class_get_property_token (MonoProperty *prop);
 
-gint32
+int32_t
 mono_array_element_size    (MonoClass *ac);
 
-gint32
+int32_t
 mono_class_instance_size   (MonoClass *klass);
 
-gint32
+int32_t
 mono_class_array_element_size (MonoClass *klass);
 
-gint32
+int32_t
 mono_class_data_size       (MonoClass *klass);
 
-gint32
-mono_class_value_size      (MonoClass *klass, guint32 *align);
+int32_t
+mono_class_value_size      (MonoClass *klass, uint32_t *align);
 
-gint32
+int32_t
 mono_class_min_align       (MonoClass *klass);
 
 MonoClass *
 mono_class_from_mono_type  (MonoType *type);
 
-gboolean
+mono_bool
 mono_class_is_subclass_of (MonoClass *klass, MonoClass *klassc, 
-                                                  gboolean check_interfaces);
+                                                  mono_bool check_interfaces);
 
-gboolean
+mono_bool
 mono_class_is_assignable_from (MonoClass *klass, MonoClass *oklass);
 
-gpointer
-mono_ldtoken               (MonoImage *image, guint32 token, MonoClass **retclass, MonoGenericContext *context);
+void*
+mono_ldtoken               (MonoImage *image, uint32_t token, MonoClass **retclass, MonoGenericContext *context);
 
 char*         
 mono_type_get_name         (MonoType *type);
@@ -132,10 +123,10 @@ mono_class_get_image         (MonoClass *klass);
 MonoClass*
 mono_class_get_element_class (MonoClass *klass);
 
-gboolean
+mono_bool
 mono_class_is_valuetype      (MonoClass *klass);
 
-gboolean
+mono_bool
 mono_class_is_enum          (MonoClass *klass);
 
 MonoType*
@@ -150,7 +141,7 @@ mono_class_get_nesting_type  (MonoClass *klass);
 int
 mono_class_get_rank          (MonoClass *klass);
 
-guint32
+uint32_t
 mono_class_get_flags         (MonoClass *klass);
 
 const char*
@@ -162,7 +153,7 @@ mono_class_get_namespace     (MonoClass *klass);
 MonoType*
 mono_class_get_type          (MonoClass *klass);
 
-guint32
+uint32_t
 mono_class_get_type_token    (MonoClass *klass);
 
 MonoType*
@@ -181,22 +172,22 @@ int
 mono_class_num_events        (MonoClass *klass);
 
 MonoClassField*
-mono_class_get_fields        (MonoClass* klass, gpointer *iter);
+mono_class_get_fields        (MonoClass* klass, void **iter);
 
 MonoMethod*
-mono_class_get_methods       (MonoClass* klass, gpointer *iter);
+mono_class_get_methods       (MonoClass* klass, void **iter);
 
 MonoProperty*
-mono_class_get_properties    (MonoClass* klass, gpointer *iter);
+mono_class_get_properties    (MonoClass* klass, void **iter);
 
 MonoEvent*
-mono_class_get_events        (MonoClass* klass, gpointer *iter);
+mono_class_get_events        (MonoClass* klass, void **iter);
 
 MonoClass*
-mono_class_get_interfaces    (MonoClass* klass, gpointer *iter);
+mono_class_get_interfaces    (MonoClass* klass, void **iter);
 
 MonoClass*
-mono_class_get_nested_types  (MonoClass* klass, gpointer *iter);
+mono_class_get_nested_types  (MonoClass* klass, void **iter);
 
 /* MonoClassField accessors */
 const char*
@@ -208,9 +199,12 @@ mono_field_get_type   (MonoClassField *field);
 MonoClass*
 mono_field_get_parent (MonoClassField *field);
 
-guint32
+uint32_t
 mono_field_get_flags  (MonoClassField *field);
 
+uint32_t
+mono_field_get_offset  (MonoClassField *field);
+
 const char *
 mono_field_get_data  (MonoClassField *field);
 
@@ -227,7 +221,7 @@ mono_property_get_get_method (MonoProperty *prop);
 MonoClass*
 mono_property_get_parent     (MonoProperty *prop);
 
-guint32
+uint32_t
 mono_property_get_flags      (MonoProperty *prop);
 
 /* MonoEvent accessors */
@@ -249,15 +243,21 @@ mono_event_get_raise_method  (MonoEvent *event);
 MonoClass*
 mono_event_get_parent        (MonoEvent *event);
 
-guint32
+uint32_t
 mono_event_get_flags         (MonoEvent *event);
 
 MonoMethod *
 mono_class_get_method_from_name (MonoClass *klass, const char *name, int param_count);
 
 char *
-mono_class_name_from_token (MonoImage *image, guint32 type_token);
+mono_class_name_from_token (MonoImage *image, uint32_t type_token);
+
+mono_bool
+mono_method_can_access_field (MonoMethod *method, MonoClassField *field);
+
+mono_bool
+mono_method_can_access_method (MonoMethod *method, MonoMethod *called);
 
-G_END_DECLS
+MONO_END_DECLS
 
 #endif /* _MONO_CLI_CLASS_H_ */