From 0ade49c286bcc28985ffdf3ac47ae3dd52bcaeb8 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 27 Nov 2018 13:40:32 +0900 Subject: [PATCH] mpi/c: add back (some more) deprecated subroutines - MPI_NULL_DELETE_FN - MPI_NULL_COPY_FN - MPI_DUP_FN Signed-off-by: Gilles Gouaillardet (cherry picked from commit 5a968306d6ae8c051dd50219cdae767e85e8db7c) --- ompi/mpi/c/attr_fn.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ompi/mpi/c/attr_fn.c b/ompi/mpi/c/attr_fn.c index d6ab52bc70..5667f24242 100644 --- a/ompi/mpi/c/attr_fn.c +++ b/ompi/mpi/c/attr_fn.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -131,11 +133,6 @@ int OMPI_C_MPI_COMM_DUP_FN( MPI_Comm comm, int comm_keyval, void* extra_state, return MPI_SUCCESS; } -#if !defined(OMPI_ENABLE_MPI1_COMPAT) - -#error "Need to delete the code below now that the removed functions are no longer shipping" - -#elif OMPI_ENABLE_MPI1_COMPAT int OMPI_C_MPI_NULL_DELETE_FN( MPI_Comm comm, int comm_keyval, void* attribute_val_out, void* extra_state ) @@ -159,4 +156,3 @@ int OMPI_C_MPI_DUP_FN( MPI_Comm comm, int comm_keyval, void* extra_state, *(void**)attribute_val_out = attribute_val_in; return MPI_SUCCESS; } -#endif