ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

merging VampirTrace-5.4.4.2 into the main branch

Просмотр исходного кода 
This commit was SVN r17336.
Этот коммит содержится в:
Matthias Jurenz 2008-01-30 17:19:01 +00:00
родитель 8ae4a10b4c
Коммит 346a90be99
3 изменённых файлов: 33 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
ompi/contrib/vt/vt/acinclude.m4
Просмотреть файл

@ -1356,10 +1356,17 @@ AC_DEFUN([ACVT_OTF],
esac
otf_conf_cmd="$otf_srcdir/configure"
otf_conf_args=
AS_IF([test x"$have_zlib" = "xyes"],
[
AS_IF([test x"$force_zlib" = "xyes"],
[otf_conf_args=--with-zlib], [otf_conf_args=""])
[otf_conf_args="$otf_conf_args --with-zlib"])
AS_IF([test x"$zlib_incdir_withval" != x],
[otf_conf_args="$otf_conf_args --with-zlib-inc-dir=$zlib_incdir_withval"])
AS_IF([test x"$zlib_libdir_withval" != x],
[otf_conf_args="$otf_conf_args --with-zlib-lib-dir=$zlib_libdir_withval"])
AS_IF([test x"$ZLIBLIB" != x],
[otf_conf_args="$otf_conf_args --with-zlib-lib=$ZLIBLIB"])
],
[
otf_conf_args=--without-zlib
@ -1658,6 +1665,8 @@ AC_DEFUN([ACVT_ZLIB],
check_zlib="yes"
force_zlib="no"
have_zlib="no"
zlib_incdir_withval=
zlib_libdir_withval=
ZLIBDIR=
ZLIBINCDIR=
@ -1676,13 +1685,13 @@ AC_DEFUN([ACVT_ZLIB],
AC_ARG_WITH(zlib-inc-dir,
AC_HELP_STRING([--with-zlib-inc-dir=ZLIBINCDIR],
[give the path for ZLIB-include files, default: ZLIB/include]),
[ZLIBINCDIR="-I$withval/"],
[zlib_incdir_withval=$withval; ZLIBINCDIR="-I$withval/"],
[AS_IF([test x"$ZLIBDIR" != x], [ZLIBINCDIR="-I$ZLIBDIR"include/])])
AC_ARG_WITH(zlib-lib-dir,
AC_HELP_STRING([--with-zlib-lib-dir=ZLIBLIBDIR],
[give the path for ZLIB-libraries, default: ZLIBDIR/lib]),
[ZLIBLIBDIR="-L$withval/"],
[zlib_libdir_withval=$withval; ZLIBLIBDIR="-L$withval/"],
[AS_IF([test x"$ZLIBDIR" != x], [ZLIBLIBDIR="-L$ZLIBDIR"lib/])])
AC_ARG_WITH(zlib-lib,

23
ompi/contrib/vt/vt/configure поставляемый
Просмотреть файл

@ -8121,6 +8121,8 @@ fi
check_zlib="yes"
force_zlib="no"
have_zlib="no"
zlib_incdir_withval=
zlib_libdir_withval=
ZLIBDIR=
ZLIBINCDIR=
@ -8148,7 +8150,7 @@ fi
# Check whether --with-zlib-inc-dir was given.
if test "${with_zlib_inc_dir+set}" = set; then
withval=$with_zlib_inc_dir; ZLIBINCDIR="-I$withval/"
withval=$with_zlib_inc_dir; zlib_incdir_withval=$withval; ZLIBINCDIR="-I$withval/"
else
if test x"$ZLIBDIR" != x; then
ZLIBINCDIR="-I$ZLIBDIR"include/
@ -8160,7 +8162,7 @@ fi
# Check whether --with-zlib-lib-dir was given.
if test "${with_zlib_lib_dir+set}" = set; then
withval=$with_zlib_lib_dir; ZLIBLIBDIR="-L$withval/"
withval=$with_zlib_lib_dir; zlib_libdir_withval=$withval; ZLIBLIBDIR="-L$withval/"
else
if test x"$ZLIBDIR" != x; then
ZLIBLIBDIR="-L$ZLIBDIR"lib/
@ -8714,12 +8716,23 @@ fi
esac
otf_conf_cmd="$otf_srcdir/configure"
otf_conf_args=
if test x"$have_zlib" = "xyes"; then
if test x"$force_zlib" = "xyes"; then
otf_conf_args=--with-zlib
else
otf_conf_args=""
otf_conf_args="$otf_conf_args --with-zlib"
fi
if test x"$zlib_incdir_withval" != x; then
otf_conf_args="$otf_conf_args --with-zlib-inc-dir=$zlib_incdir_withval"
fi
if test x"$zlib_libdir_withval" != x; then
otf_conf_args="$otf_conf_args --with-zlib-lib-dir=$zlib_libdir_withval"
fi
if test x"$ZLIBLIB" != x; then
otf_conf_args="$otf_conf_args --with-zlib-lib=$ZLIBLIB"
fi

6
ompi/contrib/vt/vt/tools/opari/tool/ompragma_c.cc
Просмотреть файл

@ -63,9 +63,9 @@ void OMPragmaC::add_descr(int n) {
}
namespace {
inline void sreplace(string& lhs, const string& rhs, int from, int to) {
for (int i=from; i<to; ++i) lhs[i] = rhs[i];
}
//inline void sreplace(string& lhs, const string& rhs, int from, int to) {
// for (int i=from; i<to; ++i) lhs[i] = rhs[i];
//}
inline void sreplace(string& lhs, const char* rhs, int from) {
do { lhs[from] = *rhs; ++from; ++rhs; } while ( *rhs );