From 0c5d83d579c401e2297dc483f153d7946089d847 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Thu, 25 Feb 2016 15:56:08 -0600
Subject: [PATCH 1/2] cxx: "rank" is now a function in C++11

Use "myrank" instead (I tried using ::rank, but had varied
success... so I just renamed the variable).

(cherry picked from commit open-mpi/ompi@89d0a033b77d001bd2808d878cbff05c0e001b9d)
---
 ompi/mpi/cxx/comm_inln.h     | 8 ++++----
 ompi/mpi/cxx/group_inln.h    | 7 ++++---
 ompi/mpi/cxx/topology_inln.h | 7 ++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ompi/mpi/cxx/comm_inln.h b/ompi/mpi/cxx/comm_inln.h
index 53f95f8332..f5ae1b8eb2 100644
--- a/ompi/mpi/cxx/comm_inln.h
+++ b/ompi/mpi/cxx/comm_inln.h
@@ -10,7 +10,7 @@
 //                         University of Stuttgart.  All rights reserved.
 // Copyright (c) 2004-2005 The Regents of the University of California.
 //                         All rights reserved.
-// Copyright (c) 2007-2012 Cisco Systems, Inc.  All rights reserved.
+// Copyright (c) 2007-2016 Cisco Systems, Inc.  All rights reserved.
 // Copyright (c) 2011      FUJITSU LIMITED.  All rights reserved.
 // $COPYRIGHT$
 //
@@ -271,9 +271,9 @@ MPI::Comm::Get_size() const
 inline int
 MPI::Comm::Get_rank() const
 {
-  int rank;
-  (void)MPI_Comm_rank (mpi_comm, &rank);
-  return rank;
+  int myrank;
+  (void)MPI_Comm_rank (mpi_comm, &myrank);
+  return myrank;
 }
 
 inline int
diff --git a/ompi/mpi/cxx/group_inln.h b/ompi/mpi/cxx/group_inln.h
index b0d9cae188..5b2dab11b7 100644
--- a/ompi/mpi/cxx/group_inln.h
+++ b/ompi/mpi/cxx/group_inln.h
@@ -10,6 +10,7 @@
 //                         University of Stuttgart.  All rights reserved.
 // Copyright (c) 2004-2005 The Regents of the University of California.
 //                         All rights reserved.
+// Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
 // $COPYRIGHT$
 //
 // Additional copyrights may follow
@@ -32,9 +33,9 @@ MPI::Group::Get_size() const
 inline int
 MPI::Group::Get_rank() const
 {
-  int rank;
-  (void)MPI_Group_rank(mpi_group, &rank);
-  return rank;
+  int myrank;
+  (void)MPI_Group_rank(mpi_group, &myrank);
+  return myrank;
 }
 
 inline void
diff --git a/ompi/mpi/cxx/topology_inln.h b/ompi/mpi/cxx/topology_inln.h
index 41b90c7fd2..13a1542bd9 100644
--- a/ompi/mpi/cxx/topology_inln.h
+++ b/ompi/mpi/cxx/topology_inln.h
@@ -12,6 +12,7 @@
 //                         All rights reserved.
 // Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
 // Copyright (c) 2011      FUJITSU LIMITED.  All rights reserved.
+// Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
 // $COPYRIGHT$
 //
 // Additional copyrights may follow
@@ -81,9 +82,9 @@ MPI::Cartcomm::Get_topo(int maxdims, int dims[], bool periods[],
 inline int
 MPI::Cartcomm::Get_cart_rank(const int coords[]) const
 {
-  int rank;
-  (void)MPI_Cart_rank(mpi_comm, const_cast<int *>(coords), &rank);
-  return rank;
+  int myrank;
+  (void)MPI_Cart_rank(mpi_comm, const_cast<int *>(coords), &myrank);
+  return myrank;
 }
 
 inline void

From 9501f4521bf67d7bae0b529c70935091d2c9c728 Mon Sep 17 00:00:00 2001
From: Gilles Gouaillardet <gilles@rist.or.jp>
Date: Mon, 29 Feb 2016 13:56:22 +0900
Subject: [PATCH 2/2] opal: fix pragma for GCC 6 and later GCC 6 and later
 should ignore -Wpedantic instead of -pedantic

(cherry picked from commit open-mpi/ompi@e5d6b97db4fa1537e62e8ed95de4234dcc434738)
---
 opal/include/opal_stdint.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/opal/include/opal_stdint.h b/opal/include/opal_stdint.h
index cd18962770..4089cb55a9 100644
--- a/opal/include/opal_stdint.h
+++ b/opal/include/opal_stdint.h
@@ -12,6 +12,8 @@
  *                         All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -52,7 +54,7 @@ typedef uint128_t opal_uint128_t;
 /* Clang won't quietly accept "-pedantic", but GCC versions older than ~4.8
  * won't quietly accept "-Wpedanic".  The whole "#pragma GCC diagnostic ..."
  * facility only was added to GCC as of version 4.6. */
-#if defined(__clang__)
+#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 6)
 #pragma GCC diagnostic ignored "-Wpedantic"
 #else
 #pragma GCC diagnostic ignored "-pedantic"