From c888ceaa556c215639bb0aa86ba6ca024bb8e633 Mon Sep 17 00:00:00 2001 From: Matthias Jurenz Date: Mon, 20 Feb 2012 09:36:09 +0000 Subject: [PATCH] Changes to VT: - vtunify[-mpi]: - fixed compile error with Clang++ v2.9 and v3.0 This commit was SVN r25962. --- ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs_recs.h | 8 ++++++++ ompi/contrib/vt/vt/tools/vtunify/vt_unify_tkfac_scope.hh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs_recs.h b/ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs_recs.h index 18e17e0f80..51b84aaefe 100644 --- a/ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs_recs.h +++ b/ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs_recs.h @@ -89,6 +89,14 @@ struct DefRec_BaseS VT_MPI_INT & bufferPos ); #endif // VT_MPI + // NOTE: this operator is actually not used but necessary to work around + // a build error with the Clang++ compiler + // (see http://www.open-mpi.org/community/lists/devel/2012/02/10419.php) + bool operator<( const DefRec_BaseS & a ) const + { + return dtype < a.dtype; + } + DefRecTypeT dtype; uint32_t loccpuid; uint32_t deftoken; diff --git a/ompi/contrib/vt/vt/tools/vtunify/vt_unify_tkfac_scope.hh b/ompi/contrib/vt/vt/tools/vtunify/vt_unify_tkfac_scope.hh index 96a3f41702..84ac913456 100644 --- a/ompi/contrib/vt/vt/tools/vtunify/vt_unify_tkfac_scope.hh +++ b/ompi/contrib/vt/vt/tools/vtunify/vt_unify_tkfac_scope.hh @@ -60,7 +60,7 @@ TokenFactoryScopeC::create( const void * localDef, uint32_t globalToken ) else global_def.deftoken = globalToken; - m_globDefs->insert( global_def ).first; + m_globDefs->insert( global_def ); } // set token translation for process, if necessary