Add explicit conversions.
This commit was SVN r13265.
Этот коммит содержится в:
родитель
6f720f0d26
Коммит
a4488ff8d2
@ -57,8 +57,8 @@ int mca_rcache_vma_find(struct mca_rcache_base_module_t* rcache,
|
|||||||
base_addr = down_align_addr(addr, mca_mpool_base_page_size_log);
|
base_addr = down_align_addr(addr, mca_mpool_base_page_size_log);
|
||||||
bound_addr = up_align_addr((void*) ((unsigned long) addr + size - 1), mca_mpool_base_page_size_log);
|
bound_addr = up_align_addr((void*) ((unsigned long) addr + size - 1), mca_mpool_base_page_size_log);
|
||||||
|
|
||||||
*reg = mca_rcache_vma_tree_find((mca_rcache_vma_module_t*)rcache, base_addr,
|
*reg = mca_rcache_vma_tree_find((mca_rcache_vma_module_t*)rcache, (unsigned char*)base_addr,
|
||||||
bound_addr);
|
(unsigned char*)bound_addr);
|
||||||
|
|
||||||
return OMPI_SUCCESS;
|
return OMPI_SUCCESS;
|
||||||
}
|
}
|
||||||
@ -76,7 +76,7 @@ int mca_rcache_vma_find_all(struct mca_rcache_base_module_t* rcache,
|
|||||||
bound_addr = up_align_addr((void*) ((unsigned long) addr + size - 1), mca_mpool_base_page_size_log);
|
bound_addr = up_align_addr((void*) ((unsigned long) addr + size - 1), mca_mpool_base_page_size_log);
|
||||||
|
|
||||||
return mca_rcache_vma_tree_find_all((mca_rcache_vma_module_t*)rcache,
|
return mca_rcache_vma_tree_find_all((mca_rcache_vma_module_t*)rcache,
|
||||||
base_addr, bound_addr, regs);
|
(unsigned char*)base_addr, (unsigned char*)bound_addr, regs);
|
||||||
}
|
}
|
||||||
|
|
||||||
int mca_rcache_vma_insert(struct mca_rcache_base_module_t* rcache,
|
int mca_rcache_vma_insert(struct mca_rcache_base_module_t* rcache,
|
||||||
|
@ -266,7 +266,7 @@ mca_mpool_base_registration_t *mca_rcache_vma_tree_find(
|
|||||||
mca_rcache_vma_t *vma;
|
mca_rcache_vma_t *vma;
|
||||||
mca_rcache_vma_reg_list_item_t *item;
|
mca_rcache_vma_reg_list_item_t *item;
|
||||||
|
|
||||||
vma = ompi_rb_tree_find_with(&vma_rcache->rb_tree, base,
|
vma = (mca_rcache_vma_t*)ompi_rb_tree_find_with(&vma_rcache->rb_tree, base,
|
||||||
mca_rcache_vma_tree_node_compare_search);
|
mca_rcache_vma_tree_node_compare_search);
|
||||||
|
|
||||||
if(!vma)
|
if(!vma)
|
||||||
@ -310,7 +310,7 @@ int mca_rcache_vma_tree_find_all(
|
|||||||
do {
|
do {
|
||||||
mca_rcache_vma_t *vma;
|
mca_rcache_vma_t *vma;
|
||||||
opal_list_item_t *item;
|
opal_list_item_t *item;
|
||||||
vma = ompi_rb_tree_find_with(&vma_rcache->rb_tree, base,
|
vma = (mca_rcache_vma_t*)ompi_rb_tree_find_with(&vma_rcache->rb_tree, base,
|
||||||
mca_rcache_vma_tree_node_compare_closest);
|
mca_rcache_vma_tree_node_compare_closest);
|
||||||
|
|
||||||
if(NULL == vma) {
|
if(NULL == vma) {
|
||||||
@ -464,7 +464,7 @@ int mca_rcache_vma_tree_delete(mca_rcache_vma_module_t* vma_rcache,
|
|||||||
{
|
{
|
||||||
mca_rcache_vma_t *vma;
|
mca_rcache_vma_t *vma;
|
||||||
|
|
||||||
vma = ompi_rb_tree_find_with(&vma_rcache->rb_tree, reg->base,
|
vma = (mca_rcache_vma_t*)ompi_rb_tree_find_with(&vma_rcache->rb_tree, reg->base,
|
||||||
mca_rcache_vma_tree_node_compare_search);
|
mca_rcache_vma_tree_node_compare_search);
|
||||||
|
|
||||||
if(!vma)
|
if(!vma)
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user