Revert "Update to sync with OMPI master and cleanup to build"

This reverts commit cb55c88a8b.

ompi/mpi/cxx/errhandler.h

@@ -0,0 +1,63 @@
+// -*- c++ -*-
+//
+// Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+//                         University Research and Technology
+//                         Corporation.  All rights reserved.
+// Copyright (c) 2004-2005 The University of Tennessee and The University
+//                         of Tennessee Research Foundation.  All rights
+//                         reserved.
+// Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+//                         University of Stuttgart.  All rights reserved.
+// Copyright (c) 2004-2005 The Regents of the University of California.
+//                         All rights reserved.
+// Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
+// $COPYRIGHT$
+//
+// Additional copyrights may follow
+//
+// $HEADER$
+//
+
+class Errhandler {
+public:
+  // construction / destruction
+  inline Errhandler()
+    : mpi_errhandler(MPI_ERRHANDLER_NULL) {}
+
+  inline virtual ~Errhandler() { }
+
+  inline Errhandler(MPI_Errhandler i)
+    : mpi_errhandler(i) {}
+
+ // copy / assignment
+  inline Errhandler(const Errhandler& e) : mpi_errhandler(e.mpi_errhandler) { }
+
+  inline Errhandler& operator=(const Errhandler& e) {
+    mpi_errhandler = e.mpi_errhandler;
+    return *this;
+  }
+
+  // comparison
+  inline bool operator==(const Errhandler &a) {
+    return (bool)(mpi_errhandler == a.mpi_errhandler); }
+
+  inline bool operator!=(const Errhandler &a) {
+    return (bool)!(*this == a); }
+
+  // inter-language operability
+  inline Errhandler& operator= (const MPI_Errhandler &i) {
+    mpi_errhandler = i; return *this; }
+
+  inline operator MPI_Errhandler() const { return mpi_errhandler; }
+
+  //  inline operator MPI_Errhandler*() { return &mpi_errhandler; }
+
+  //
+  // Errhandler access functions
+  //
+
+  virtual void Free();
+
+private:
+  MPI_Errhandler mpi_errhandler;
+};