Merge pull request #991 from jsquyres/pr/v2.0.0/cxx11-has-jumped-the-shark

v2.0.0: cxx: "rank" is now a function in C++11

Author: hppritcha

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

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

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

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"