projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into mono4-continuations_fix
[mono.git]
/
mono
/
metadata
/
null-gc.c
diff --git
a/mono/metadata/null-gc.c
b/mono/metadata/null-gc.c
index e5c16e1e9a46b2eab51c6249b54115f6ed82bad6..f987e6c34837248b7368e0e19dda783615a0a3bd 100644
(file)
--- a/
mono/metadata/null-gc.c
+++ b/
mono/metadata/null-gc.c
@@
-4,6
+4,7
@@
* Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
* Copyright 2004-2011 Novell, Inc (http://www.novell.com)
* Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
* Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
* Copyright 2004-2011 Novell, Inc (http://www.novell.com)
* Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
*/
#include "config.h"
*/
#include "config.h"
@@
-234,6
+235,18
@@
mono_gc_alloc_string (MonoVTable *vtable, size_t size, gint32 len)
return obj;
}
return obj;
}
+void*
+mono_gc_alloc_mature (MonoVTable *vtable, size_t size)
+{
+ return mono_gc_alloc_obj (vtable, size);
+}
+
+void*
+mono_gc_alloc_pinned_obj (MonoVTable *vtable, size_t size)
+{
+ return mono_gc_alloc_obj (vtable, size);
+}
+
void
mono_gc_wbarrier_set_field (MonoObject *obj, gpointer field_ptr, MonoObject* value)
{
void
mono_gc_wbarrier_set_field (MonoObject *obj, gpointer field_ptr, MonoObject* value)
{
@@
-308,7
+321,7
@@
mono_gc_get_managed_array_allocator (MonoClass *klass)
}
MonoMethod*
}
MonoMethod*
-mono_gc_get_managed_allocator_by_type (int atype,
gboolean slowpath
)
+mono_gc_get_managed_allocator_by_type (int atype,
ManagedAllocatorVariant variant
)
{
return NULL;
}
{
return NULL;
}