1
1

* fix #730 for removing an extra argument from MPI::Win::Get_attr as being

corrected in the MPI 2.0 errata.
 * initialized some variables to make our sensitive sun compiler not to 
   not warn about them when user apps are compiling.

This commit was SVN r13058.
Этот коммит содержится в:
Pak Lui 2007-01-09 23:48:39 +00:00
родитель c9be97c089
Коммит de51464aad
5 изменённых файлов: 12 добавлений и 9 удалений

Просмотреть файл

@ -11,6 +11,7 @@
// Copyright (c) 2004-2005 The Regents of the University of California. // Copyright (c) 2004-2005 The Regents of the University of California.
// All rights reserved. // All rights reserved.
// Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. // Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
// Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -20,7 +21,7 @@
inline inline
MPI::Intracomm::Intracomm(MPI_Comm data) { MPI::Intracomm::Intracomm(MPI_Comm data) {
int flag; int flag = 0;
if (MPI::Is_initialized() && (data != MPI_COMM_NULL)) { if (MPI::Is_initialized() && (data != MPI_COMM_NULL)) {
(void)MPI_Comm_test_inter(data, &flag); (void)MPI_Comm_test_inter(data, &flag);
if (flag) { if (flag) {

Просмотреть файл

@ -11,6 +11,7 @@
// Copyright (c) 2004-2005 The Regents of the University of California. // Copyright (c) 2004-2005 The Regents of the University of California.
// All rights reserved. // All rights reserved.
// Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. // Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
// Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -313,7 +314,7 @@ MPI::Prequest::Startall(int count, MPI:: Prequest array_of_requests[])
inline bool MPI::Request::Get_status(MPI::Status& status) const inline bool MPI::Request::Get_status(MPI::Status& status) const
{ {
int flag; int flag = 0;
MPI_Status c_status; MPI_Status c_status;
// Call the underlying MPI function rather than simply returning // Call the underlying MPI function rather than simply returning

Просмотреть файл

@ -10,6 +10,7 @@
// University of Stuttgart. All rights reserved. // University of Stuttgart. All rights reserved.
// Copyright (c) 2004-2005 The Regents of the University of California. // Copyright (c) 2004-2005 The Regents of the University of California.
// All rights reserved. // All rights reserved.
// Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -23,7 +24,7 @@
inline inline
MPI::Cartcomm::Cartcomm(const MPI_Comm& data) { MPI::Cartcomm::Cartcomm(const MPI_Comm& data) {
int status; int status = 0;
if (MPI::Is_initialized() && (data != MPI_COMM_NULL)) { if (MPI::Is_initialized() && (data != MPI_COMM_NULL)) {
(void)MPI_Topo_test(data, &status) ; (void)MPI_Topo_test(data, &status) ;
if (status == MPI_CART) if (status == MPI_CART)
@ -141,7 +142,7 @@ MPI::Cartcomm::Clone() const
inline inline
MPI::Graphcomm::Graphcomm(const MPI_Comm& data) { MPI::Graphcomm::Graphcomm(const MPI_Comm& data) {
int status; int status = 0;
if (MPI::Is_initialized() && (data != MPI_COMM_NULL)) { if (MPI::Is_initialized() && (data != MPI_COMM_NULL)) {
(void)MPI_Topo_test(data, &status) ; (void)MPI_Topo_test(data, &status) ;
if (status == MPI_GRAPH) if (status == MPI_GRAPH)

Просмотреть файл

@ -11,6 +11,7 @@
// Copyright (c) 2004-2005 The Regents of the University of California. // Copyright (c) 2004-2005 The Regents of the University of California.
// All rights reserved. // All rights reserved.
// Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. // Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
// Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -150,8 +151,7 @@ public:
static void Free_keyval(int& win_keyval); static void Free_keyval(int& win_keyval);
bool Get_attr(const Win& win, int win_keyval, bool Get_attr(int win_keyval, void* attribute_val) const;
void* attribute_val) const;
virtual void Get_name(char* win_name, int& resultlen) const; virtual void Get_name(char* win_name, int& resultlen) const;

Просмотреть файл

@ -10,6 +10,7 @@
// University of Stuttgart. All rights reserved. // University of Stuttgart. All rights reserved.
// Copyright (c) 2004-2005 The Regents of the University of California. // Copyright (c) 2004-2005 The Regents of the University of California.
// All rights reserved. // All rights reserved.
// Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -189,11 +190,10 @@ MPI::Win::Delete_attr(int win_keyval)
inline bool inline bool
MPI::Win::Get_attr(const Win& win, int win_keyval, MPI::Win::Get_attr(int win_keyval, void* attribute_val) const
void* attribute_val) const
{ {
int ret; int ret;
(void) MPI_Win_get_attr(win, win_keyval, attribute_val, &ret); (void) MPI_Win_get_attr(mpi_win, win_keyval, attribute_val, &ret);
return OPAL_INT_TO_BOOL(ret); return OPAL_INT_TO_BOOL(ret);
} }