Skip to content

Commit daa55fd

Browse files
author
rhc54
committed
Merge pull request #613 from rhc54/topic/listener
Centralize listener connection support
2 parents b1c100c + ea35e47 commit daa55fd

22 files changed

+787
-1718
lines changed

opal/mca/dstore/base/dstore_base_frame.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
33
* Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
4-
* Copyright (c) 2014 Intel, Inc. All rights reserved.
4+
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
55
* Copyright (c) 2014-2015 Research Organization for Information Science
66
* and Technology (RIST). All rights reserved.
77
* $COPYRIGHT$
@@ -43,7 +43,6 @@ opal_dstore_base_API_t opal_dstore = {
4343
opal_dstore_base_t opal_dstore_base = {0};
4444

4545
int opal_dstore_internal = -1;
46-
int opal_dstore_modex = -1;
4746

4847
static int opal_dstore_base_frame_close(void)
4948
{

opal/mca/dstore/dstore.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ BEGIN_C_DECLS
4343
* as someone figures out how to separate the various
4444
* datastore channels
4545
*/
46-
OPAL_DECLSPEC extern int opal_dstore_internal;
47-
OPAL_DECLSPEC extern int opal_dstore_modex;
48-
4946
OPAL_DECLSPEC extern int opal_dstore_peer;
5047
OPAL_DECLSPEC extern int opal_dstore_internal;
5148
OPAL_DECLSPEC extern int opal_dstore_nonpeer;

opal/mca/dstore/sm/Makefile.am

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)