1
1

Fixes CIDs 421, 422, 423, 424, 425 426

Possibly fixes CID 417

 * ensure to initialize inner members upon default constructors using
   the same syntax across all classes
 * remove some member variables that aren't used anymore
 * "initialize" the inner MPI_Status in the default constructor for
   MPI::Status by calling the default constructor mpi_status().  This
   may or may not silence CID 417; we'll see what happens in
   subsequent Coverity Prevent runs.

This commit was SVN r19228.
Этот коммит содержится в:
Jeff Squyres 2008-08-08 13:49:44 +00:00
родитель 7af5f70cf3
Коммит fa25de320e
6 изменённых файлов: 10 добавлений и 31 удалений

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

@ -10,7 +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) 2006 Cisco Systems, Inc. All rights reserved. // Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -30,22 +30,10 @@ public:
: mpi_errhandler(i) {} : mpi_errhandler(i) {}
// copy / assignment // copy / assignment
inline Errhandler(const Errhandler& e) inline Errhandler(const Errhandler& e) : mpi_errhandler(e.mpi_errhandler) { }
: comm_handler_fn(e.comm_handler_fn),
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
file_handler_fn(e.file_handler_fn),
#endif
win_handler_fn(e.win_handler_fn),
mpi_errhandler(e.mpi_errhandler) { }
inline Errhandler& operator=(const Errhandler& e) inline Errhandler& operator=(const Errhandler& e) {
{
mpi_errhandler = e.mpi_errhandler; mpi_errhandler = e.mpi_errhandler;
comm_handler_fn = e.comm_handler_fn;
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
file_handler_fn = e.file_handler_fn;
#endif
win_handler_fn = e.win_handler_fn;
return *this; return *this;
} }
@ -70,11 +58,6 @@ public:
virtual void Free(); virtual void Free();
Comm::Errhandler_fn* comm_handler_fn; private:
#if OMPI_PROVIDE_MPI_FILE_INTERFACE
File::Errhandler_fn* file_handler_fn;
#endif
Win::Errhandler_fn* win_handler_fn;
MPI_Errhandler mpi_errhandler; MPI_Errhandler mpi_errhandler;
}; };

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

@ -311,9 +311,5 @@ protected:
MPI_File mpi_file; MPI_File mpi_file;
#endif #endif
public:
Errhandler* my_errhandler;
}; };

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

@ -10,7 +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) 2006 Cisco Systems, Inc. All rights reserved. // Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -54,7 +54,7 @@ public:
#else #else
Info() { } Info() : mpi_info(MPI_INFO_NULL) { }
// copy // copy
Info(const Info& data) : mpi_info(data.mpi_info) { } Info(const Info& data) : mpi_info(data.mpi_info) { }

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

@ -57,7 +57,7 @@ public:
#else #else
// construction / destruction // construction / destruction
Request() { mpi_request = MPI_REQUEST_NULL; } Request() : mpi_request(MPI_REQUEST_NULL) { }
virtual ~Request() {} virtual ~Request() {}
Request(MPI_Request i) : mpi_request(i) { } Request(MPI_Request i) : mpi_request(i) { }

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

@ -10,7 +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) 2006 Cisco Systems, Inc. All rights reserved. // Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
// $COPYRIGHT$ // $COPYRIGHT$
// //
// Additional copyrights may follow // Additional copyrights may follow
@ -55,7 +55,7 @@ public:
#else #else
Status() { } Status() : mpi_status() { }
// copy // copy
Status(const Status& data) : mpi_status(data.mpi_status) { } Status(const Status& data) : mpi_status(data.mpi_status) { }

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

@ -54,7 +54,7 @@ public:
#else #else
Win() { } Win() : mpi_win(MPI_WIN_NULL) { }
// copy // copy
Win(const Win& data) : mpi_win(data.mpi_win) { } Win(const Win& data) : mpi_win(data.mpi_win) { }