removed direct include of stdbool.h from event.h that was causing studio C++ issues. Also removed include of stdbool.h in a couple other places since it was already being pulled in via opal_config_bottom.h.
This commit was SVN r23963.
Этот коммит содержится в:
родитель
3ed00ba148
Коммит
b3f2ac8d46
@ -1,5 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
||||||
|
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
||||||
*
|
*
|
||||||
* The OPAL interface into the Libevent library. Contains a number
|
* The OPAL interface into the Libevent library. Contains a number
|
||||||
* of renamings for use inside OPAL, and some customized wrapper functions
|
* of renamings for use inside OPAL, and some customized wrapper functions
|
||||||
@ -26,9 +27,6 @@
|
|||||||
#ifdef HAVE_STDARG_H
|
#ifdef HAVE_STDARG_H
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_STDBOOL_H
|
|
||||||
#include <stdbool.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "opal/mca/mca.h"
|
#include "opal/mca/mca.h"
|
||||||
#include "opal/mca/base/base.h"
|
#include "opal/mca/base/base.h"
|
||||||
@ -73,9 +71,7 @@ typedef struct {
|
|||||||
OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_event_base_t);
|
OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_event_base_t);
|
||||||
|
|
||||||
#define OPAL_TIMEOUT_DEFAULT {1, 0}
|
#define OPAL_TIMEOUT_DEFAULT {1, 0}
|
||||||
|
|
||||||
typedef void (*opal_event_callback_fn_t)(int, short, void *);
|
typedef void (*opal_event_callback_fn_t)(int, short, void *);
|
||||||
|
|
||||||
typedef int (*opal_event_base_module_init_fn_t)(void);
|
typedef int (*opal_event_base_module_init_fn_t)(void);
|
||||||
typedef int (*opal_event_base_module_fini_fn_t)(void);
|
typedef int (*opal_event_base_module_fini_fn_t)(void);
|
||||||
typedef void (*opal_event_base_module_set_debug_output_fn_t)(bool output);
|
typedef void (*opal_event_base_module_set_debug_output_fn_t)(bool output);
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
* Copyright (c) 2007 Los Alamos National Security, LLC. All rights
|
* Copyright (c) 2007 Los Alamos National Security, LLC. All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
* Copyright (c) 2007 Voltaire. All rights reserved.
|
* Copyright (c) 2007 Voltaire. All rights reserved.
|
||||||
|
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
||||||
*
|
*
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
@ -26,14 +27,6 @@
|
|||||||
|
|
||||||
#include "opal_config.h"
|
#include "opal_config.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* Circumentvent problems in C++ compilers.
|
|
||||||
* For C++, we should not need the file, anyhow.
|
|
||||||
*/
|
|
||||||
#if defined(HAVE_STDBOOL_H) && !(defined(c_plusplus) || defined(__cplusplus))
|
|
||||||
#include <stdbool.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if OPAL_HAVE_THREAD_SUPPORT
|
#if OPAL_HAVE_THREAD_SUPPORT
|
||||||
#include "opal/sys/atomic.h"
|
#include "opal/sys/atomic.h"
|
||||||
#endif /* OPAL_HAVE_THREAD_SUPPORT */
|
#endif /* OPAL_HAVE_THREAD_SUPPORT */
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
* 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-2008 Cisco Systems, Inc. All rights reserved.
|
* Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved.
|
||||||
|
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -68,14 +69,6 @@
|
|||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* For C++, we should not need the file, anyhow.
|
|
||||||
* Circumentvent problems in C++ compilers.
|
|
||||||
*/
|
|
||||||
#if defined(HAVE_STDBOOL_H) && !(defined(c_plusplus) || defined(__cplusplus))
|
|
||||||
#include <stdbool.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "opal/class/opal_object.h"
|
#include "opal/class/opal_object.h"
|
||||||
|
|
||||||
BEGIN_C_DECLS
|
BEGIN_C_DECLS
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user