move inclusion of ompi_datatype.h from ompi_common_dll.c to ompi_debugger_canary.c to get rid of unresolved symbols
This commit was SVN r22179.
Этот коммит содержится в:
родитель
f121e46db1
Коммит
f70af6a81e
@ -19,7 +19,7 @@
|
|||||||
* Permission is hereby granted to use, reproduce, prepare derivative
|
* Permission is hereby granted to use, reproduce, prepare derivative
|
||||||
* works, and to redistribute to others.
|
* works, and to redistribute to others.
|
||||||
*
|
*
|
||||||
* DISCLAIMER
|
* DISCLAIMER
|
||||||
*
|
*
|
||||||
* Neither Dolphin Interconnect Solutions, Etnus LLC, nor any of their
|
* Neither Dolphin Interconnect Solutions, Etnus LLC, nor any of their
|
||||||
* employees, makes any warranty express or implied, or assumes any
|
* employees, makes any warranty express or implied, or assumes any
|
||||||
@ -36,7 +36,6 @@
|
|||||||
#include "ompi_config.h"
|
#include "ompi_config.h"
|
||||||
|
|
||||||
#include "ompi_common_dll_defs.h"
|
#include "ompi_common_dll_defs.h"
|
||||||
#include "ompi/datatype/ompi_datatype.h"
|
|
||||||
|
|
||||||
/* Basic callbacks into the debugger */
|
/* Basic callbacks into the debugger */
|
||||||
const mqs_basic_callbacks *mqs_basic_entrypoints;
|
const mqs_basic_callbacks *mqs_basic_entrypoints;
|
||||||
@ -402,7 +401,7 @@ int ompi_fill_in_type_info(mqs_image *image, char **message)
|
|||||||
size_t super_offset;
|
size_t super_offset;
|
||||||
|
|
||||||
ompi_field_offset(super_offset,
|
ompi_field_offset(super_offset,
|
||||||
qh_type, ompi_datatype_t, super);
|
qh_type, ompi_datatype_t, super);
|
||||||
|
|
||||||
qh_type = mqs_find_type( image, "opal_datatype_t", mqs_lang_c );
|
qh_type = mqs_find_type( image, "opal_datatype_t", mqs_lang_c );
|
||||||
if( !qh_type ) {
|
if( !qh_type ) {
|
||||||
@ -410,7 +409,7 @@ int ompi_fill_in_type_info(mqs_image *image, char **message)
|
|||||||
goto type_missing;
|
goto type_missing;
|
||||||
}
|
}
|
||||||
ompi_field_offset(i_info->ompi_datatype_t.offset.size,
|
ompi_field_offset(i_info->ompi_datatype_t.offset.size,
|
||||||
qh_type, opal_datatype_t, size);
|
qh_type, opal_datatype_t, size);
|
||||||
i_info->ompi_datatype_t.offset.size += super_offset;
|
i_info->ompi_datatype_t.offset.size += super_offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved
|
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved
|
||||||
* Copyright (c) 2008 Sun Microystems, Inc. All rights reserved
|
* Copyright (c) 2008-2009 Sun Microystems, Inc. All rights reserved
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -18,6 +18,8 @@
|
|||||||
#include "ompi/mca/pml/base/pml_base_request.h"
|
#include "ompi/mca/pml/base/pml_base_request.h"
|
||||||
#include "ompi/mca/pml/base/pml_base_sendreq.h"
|
#include "ompi/mca/pml/base/pml_base_sendreq.h"
|
||||||
#include "ompi/mca/pml/base/pml_base_recvreq.h"
|
#include "ompi/mca/pml/base/pml_base_recvreq.h"
|
||||||
|
#include "opal/datatype/opal_datatype.h"
|
||||||
|
#include "ompi/datatype/ompi_datatype.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Define ompi_field_offset() to be a debugging macro only -- just
|
* Define ompi_field_offset() to be a debugging macro only -- just
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user