Skip to content

Commit 5d6dcec

Browse files
committed
Drop the typemap_ prefix
1 parent 1e3f82b commit 5d6dcec

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/native/clr/host/typemap.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ auto TypeMapper::find_managed_to_java_map_entry (hash_t name_hash, const TypeMap
213213
}
214214

215215
[[gnu::always_inline]]
216-
auto TypeMapper::typemap_managed_to_java_release (const char *typeName, const uint8_t *mvid) noexcept -> const char*
216+
auto TypeMapper::managed_to_java_release (const char *typeName, const uint8_t *mvid) noexcept -> const char*
217217
{
218218
const TypeMapModule *match = find_module_entry (mvid, managed_to_java_map, managed_to_java_map_module_count);
219219
if (match == nullptr) {
@@ -322,7 +322,7 @@ auto TypeMapper::managed_to_java (const char *typeName, const uint8_t *mvid) noe
322322

323323
auto do_map = [&typeName, &mvid]() -> const char* {
324324
#if defined(RELEASE)
325-
return typemap_managed_to_java_release (typeName, mvid);
325+
return managed_to_java_release (typeName, mvid);
326326
#else
327327
return managed_to_java_debug (typeName, mvid);
328328
#endif
@@ -386,7 +386,7 @@ auto TypeMapper::find_java_to_managed_entry (hash_t name_hash) noexcept -> const
386386
}
387387

388388
[[gnu::flatten]]
389-
auto TypeMapper::typemap_java_to_managed_release (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool
389+
auto TypeMapper::java_to_managed_release (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool
390390
{
391391
if (java_type_name == nullptr || assembly_name == nullptr || managed_type_token_id == nullptr) [[unlikely]] {
392392
if (java_type_name == nullptr) {
@@ -464,7 +464,7 @@ auto TypeMapper::java_to_managed (const char *java_type_name, char const** assem
464464

465465
bool ret;
466466
#if defined(RELEASE)
467-
ret = typemap_java_to_managed_release (java_type_name, assembly_name, managed_type_token_id);
467+
ret = java_to_managed_release (java_type_name, assembly_name, managed_type_token_id);
468468
#else
469469
ret = java_to_managed_debug (java_type_name, assembly_name, managed_type_token_id);
470470
#endif

src/native/clr/include/host/typemap.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ namespace xamarin::android {
2222
static auto compare_mvid (const uint8_t *mvid, TypeMapModule const& module) noexcept -> int;
2323
static auto find_module_entry (const uint8_t *mvid, const TypeMapModule *entries, size_t entry_count) noexcept -> const TypeMapModule*;
2424
static auto find_managed_to_java_map_entry (hash_t name_hash, const TypeMapModuleEntry *map, size_t entry_count) noexcept -> const TypeMapModuleEntry*;
25-
static auto typemap_managed_to_java_release (const char *typeName, const uint8_t *mvid) noexcept -> const char*;
26-
static auto typemap_java_to_managed_release (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool;
25+
static auto managed_to_java_release (const char *typeName, const uint8_t *mvid) noexcept -> const char*;
26+
static auto java_to_managed_release (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool;
2727

2828
static auto find_java_to_managed_entry (hash_t name_hash) noexcept -> const TypeMapJava*;
2929
#else

0 commit comments

Comments
 (0)