1
1

created opal_version_string and orte_version_string to match the ompi changes

made in r18345 for ompi_version_string.  This was done per request from Jeff 
Squyres to maintain consistency and to remove some warnings caused by the 
non-use of some static const char.

This commit was SVN r18461.

The following SVN revision numbers were found above:
  r18345 --> open-mpi/ompi@8dd0421015
Этот коммит содержится в:
Terry Dontje 2008-05-20 12:13:19 +00:00
родитель c546d7bda9
Коммит ef7ac86929
4 изменённых файлов: 11 добавлений и 6 удалений

Просмотреть файл

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -27,6 +28,9 @@
extern "C" { extern "C" {
#endif #endif
/** version string of opal */
OPAL_DECLSPEC extern const char opal_version_string[];
/** /**
* Initialize the OPAL layer, including the MCA system. * Initialize the OPAL layer, including the MCA system.
* *

Просмотреть файл

@ -57,9 +57,8 @@
#pragma ident OPAL_IDENT_STRING #pragma ident OPAL_IDENT_STRING
#elif OMPI_CC_USE_IDENT #elif OMPI_CC_USE_IDENT
#ident OPAL_IDENT_STRING #ident OPAL_IDENT_STRING
#else
static const char ident[] = OPAL_IDENT_STRING;
#endif #endif
const char opal_version_string[] = OPAL_IDENT_STRING;
int opal_initialized = 0; int opal_initialized = 0;
int opal_util_initialized = 0; int opal_util_initialized = 0;

Просмотреть файл

@ -12,7 +12,7 @@
* Copyright (c) 2006 Los Alamos National Security, LLC. All rights * Copyright (c) 2006 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2007-2008 Sun Microsystems, Inc. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -51,9 +51,8 @@
#pragma ident ORTE_IDENT_STRING #pragma ident ORTE_IDENT_STRING
#elif OMPI_CC_USE_IDENT #elif OMPI_CC_USE_IDENT
#ident ORTE_IDENT_STRING #ident ORTE_IDENT_STRING
#else
static const char ident[] = ORTE_IDENT_STRING;
#endif #endif
const char orte_version_string[] = ORTE_IDENT_STRING;
int orte_init(char flags) int orte_init(char flags)
{ {

Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2007-2008 Sun Microsystems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -38,6 +38,9 @@
BEGIN_C_DECLS BEGIN_C_DECLS
/** version string of ompi */
ORTE_DECLSPEC extern const char orte_version_string[];
/* some convenience definitions for code clarity */ /* some convenience definitions for code clarity */
#define ORTE_NON_TOOL 0x00 #define ORTE_NON_TOOL 0x00
#define ORTE_TOOL 0x01 #define ORTE_TOOL 0x01