From fb12572438f7c8ef43e1b6662645fdccc0c65694 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 26 May 2015 18:58:28 -0700 Subject: [PATCH] OFI: make v1.10 and v2.0 fit in version checking scheme v1.10 is now in the same compatibility level as v1.7/v1.8 (there is/will be no v1.9 series). v2.0 now takes over for what used to be called v1.9. --- ompi/mca/mtl/ofi/mtl_ofi_compat.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ompi/mca/mtl/ofi/mtl_ofi_compat.h b/ompi/mca/mtl/ofi/mtl_ofi_compat.h index 2c03f2c512..f8fe3a7b89 100644 --- a/ompi/mca/mtl/ofi/mtl_ofi_compat.h +++ b/ompi/mca/mtl/ofi/mtl_ofi_compat.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -15,10 +16,9 @@ /************************************************************************/ -/* v1.9 and beyond */ +/* v2.0 and beyond */ -#if (OPAL_MAJOR_VERSION == 1 && OPAL_MINOR_VERSION >= 9) || \ - (OPAL_MAJOR_VERSION >= 2) +#if (OPAL_MAJOR_VERSION >= 2) #include "opal/mca/pmix/pmix.h" @@ -42,7 +42,7 @@ /************************************************************************/ -/* v1.7 and v1.8 */ +/* v1.7, v1.8, and v1.10 (there was no v1.9) */ #elif (OPAL_MAJOR_VERSION == 1 && OPAL_MINOR_VERSION >= 7)