Bugfix (Ticket #1318): Implemented copy-contructor of 'FiltHandlerArgument' in 'vt_filthandler.cc' instead of the header file 'vt_filthandler.h'
This commit was SVN r18637.
Этот коммит содержится в:
родитель
a239877b78
Коммит
a9ff2b84f2
@ -17,6 +17,17 @@ using namespace std;
|
|||||||
//#define FF cerr << omp_get_thread_num() << " " << __func__ << endl;
|
//#define FF cerr << omp_get_thread_num() << " " << __func__ << endl;
|
||||||
#define FF
|
#define FF
|
||||||
|
|
||||||
|
/* MJ: Workaround for Pathscale problem (Open MPI Ticket: #1318)
|
||||||
|
It seems that the Pathscale compiler doesn't allow the implementation
|
||||||
|
of the FiltHandlerArgument's copy-constructor in the header file
|
||||||
|
'vt_filthandler.h'. It looks very stange for me. :-( */
|
||||||
|
FiltHandlerArgument::FiltHandlerArgument(const FiltHandlerArgument& fha)
|
||||||
|
{
|
||||||
|
nm2tok = fha.nm2tok;
|
||||||
|
t2p = fha.t2p;
|
||||||
|
wstream = fha.wstream;
|
||||||
|
mc = fha.mc;
|
||||||
|
}
|
||||||
|
|
||||||
int handleFiltDefinitionComment( void* userData,
|
int handleFiltDefinitionComment( void* userData,
|
||||||
uint32_t stream,
|
uint32_t stream,
|
||||||
|
@ -28,6 +28,11 @@ struct Process {
|
|||||||
std::map<uint32_t,uint64_t> f2l; /* contains the functionstack of every process - written = true, ignored = false */
|
std::map<uint32_t,uint64_t> f2l; /* contains the functionstack of every process - written = true, ignored = false */
|
||||||
};
|
};
|
||||||
struct FiltHandlerArgument {
|
struct FiltHandlerArgument {
|
||||||
|
|
||||||
|
FiltHandlerArgument() {}
|
||||||
|
|
||||||
|
FiltHandlerArgument(const FiltHandlerArgument& fha);
|
||||||
|
|
||||||
std::map<std::string, uint32_t> nm2tok; /* created during definition reading*/
|
std::map<std::string, uint32_t> nm2tok; /* created during definition reading*/
|
||||||
std::map<uint32_t, Process > t2p;
|
std::map<uint32_t, Process > t2p;
|
||||||
OTF_WStream* wstream;
|
OTF_WStream* wstream;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user